diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 11:36:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 11:36:18 (GMT) |
| commit | b738719a192c49f9bab64cebfa2bad67b9630870 (patch) | |
| tree | 4f19a338ad94e70992a95166544afacac45ef2e1 /doc/src/snippets/code | |
| parent | b5946e6acd272ce96ae89fdd2fffd607a9f48770 (diff) | |
| parent | 04fe6ee36cbabf7e2a8e70f3baed026a23394b4f (diff) | |
| download | Qt-b738719a192c49f9bab64cebfa2bad67b9630870.zip Qt-b738719a192c49f9bab64cebfa2bad67b9630870.tar.gz Qt-b738719a192c49f9bab64cebfa2bad67b9630870.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compile.
Fix recursion in QScriptEngine::toScriptValue
Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4
Remove usage of deprecated QScriptValue* function
Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue
Remove the use of deprecated qVariant*
Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValue
Remove the use of deprecated qFindChild(ren)
Deprecated qFindChild and qFindChildren
Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded char
tst_qsharedpointer.cpp: fix compilation
Fix compilation with QT_NO_DEBUG_STREAM
QImage::fill() overloads that take QColor and Qt::GlobalColor
qmake: qmakeDeleteCacheClear() function can be template now
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
Fix MS Visual C++ 6.0 references in the documentation
Remove obsolete code & workarounds for unsupported versions of MS Visual C++
Diffstat (limited to 'doc/src/snippets/code')
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/code/doc_src_porting4.qdoc b/doc/src/snippets/code/doc_src_porting4.qdoc index 7a39f2e..9ed557c 100644 --- a/doc/src/snippets/code/doc_src_porting4.qdoc +++ b/doc/src/snippets/code/doc_src_porting4.qdoc @@ -165,7 +165,7 @@ while (i.hasNext()) { //! [18] -QList<QWidget *> myWidgets = qFindChildren<QWidget *>(myParent); +QList<QWidget *> myWidgets = myParent->findChildren<QWidget *>(); //! [18] diff --git a/doc/src/snippets/code/doc_src_qtscript.qdoc b/doc/src/snippets/code/doc_src_qtscript.qdoc index 8effdf3..a81029e 100644 --- a/doc/src/snippets/code/doc_src_qtscript.qdoc +++ b/doc/src/snippets/code/doc_src_qtscript.qdoc @@ -964,7 +964,7 @@ QScriptValue constructXmlStreamReader(QScriptContext *context, QScriptEngine *en XmlStreamReaderPointer pointer(reader); // store the shared pointer in the script object that we are constructing - return engine->newVariant(context->thisObject(), qVariantFromValue(pointer)); + return engine->newVariant(context->thisObject(), QVariant::fromValue(pointer)); } //! [93] diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp index fd3f5d2..e81745c 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp @@ -132,5 +132,5 @@ return QVariant::fromValue(s); //! [8] QObject *object = getObjectFromSomewhere(); -QVariant data = qVariantFromValue(object); +QVariant data = QVariant::fromValue(object); //! [8] diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp index 139e0a3..ef5cfb2 100644 --- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp +++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp @@ -163,7 +163,7 @@ break; default: if (v.userType() == qMetaTypeId<QXmlName>()) { - QXmlName n = qVariantValue<QXmlName>(v); + QXmlName n = qvariant_cast<QXmlName>(v); // process QXmlName n... } else { |