diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-09 11:04:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 12:32:30 +0100 |
| commit | 152eec7aa42cf688619beee5792838ce6dd5c7eb (patch) | |
| tree | 192ebbe4fc6f87dbaa3f0cab7efc4443d826e10c /doc/src/snippets | |
| parent | 86abc878832db67da87b9fe34faa4bc8d71446b0 (diff) | |
| parent | 08a993526eb1d98e0e22c6d4ae08d0cf2a587e49 (diff) | |
Merge "Merge remote-tracking branch 'origin/containers' into api_changes" into refs/staging/api_changes
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp index afba3b6a619..7c0c2c21221 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp @@ -107,7 +107,7 @@ for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i) const QMetaObject* metaObject = obj->metaObject(); QStringList methods; for(int i = metaObject->methodOffset(); i < metaObject->methodCount(); ++i) - methods << QString::fromLatin1(metaObject->method(i).signature()); + methods << QString::fromLatin1(metaObject->method(i).methodSignature()); //! [methodCount] //! [6] diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp index 9d72c425045..d0a7a69884d 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp @@ -73,7 +73,7 @@ MyStruct s2 = var.value<MyStruct>(); //! [3] int id = QMetaType::type("MyClass"); -if (id != 0) { +if (id != QMetaType::UnknownType) { void *myClassPtr = QMetaType::create(id); ... QMetaType::destroy(id, myClassPtr); |