diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:40:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:40:25 (GMT) |
| commit | 63711cb855114b879c6bad192708bf6a19c31f32 (patch) | |
| tree | 02a0cba8fdceb031afa39a93c18970884aa80bf2 /doc/src/porting/porting4.qdoc | |
| parent | 7acefef29430532a95c5fe7a11578c03bb820fae (diff) | |
| parent | 5203b315aae66ada8ced60fbce3064ad92551848 (diff) | |
| download | Qt-63711cb855114b879c6bad192708bf6a19c31f32.zip Qt-63711cb855114b879c6bad192708bf6a19c31f32.tar.gz Qt-63711cb855114b879c6bad192708bf6a19c31f32.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:
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/porting/porting4.qdoc')
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index f355e7b..698e4a5 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -2374,8 +2374,8 @@ pointer to a QObjectList. See also the comments on QObjectList below. - Use QObject::findChildren() (or qFindChildren() if you need MSVC 6 - compatibility) instead of QObject::queryList(). For example: + Use QObject::findChildren() instead of QObject::queryList(). + For example: \snippet doc/src/snippets/code/doc_src_porting4.qdoc 18 |