diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 19:25:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 19:25:17 (GMT) |
| commit | 853ccf8e41b328ef277acad463c3028b5cd2d391 (patch) | |
| tree | f3f49bb37b5dc7569fdb2059fc87705738c772d1 /src/corelib/concurrent | |
| parent | bf340b9ee5058a64e1655c8d3f5089e02c431d22 (diff) | |
| parent | 913ea0d5cdee3a182a811db2bb9440aee679ae08 (diff) | |
| download | Qt-853ccf8e41b328ef277acad463c3028b5cd2d391.zip Qt-853ccf8e41b328ef277acad463c3028b5cd2d391.tar.gz Qt-853ccf8e41b328ef277acad463c3028b5cd2d391.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (168 commits)
Remove enums from bitfield, since all compilers do not support them.
Don't circumvent onDestruction handlers when clearing expression in delegate cleanup
Fix responseText to check the charset encoding field and also to not
Re-insert and emit the correct NOTIFY signals following the removal
Fix poor flicking behavior with slower flicks.
Alignment of shadow for rich text is broken when using text styles
typo
Setting one dimension of the sourceSize should set the other dimension.
Document calling QObject methods from QML in Extending QML in C++ docs.
Stabilize tst_qgraphicsscene
QDeclarativeDebug: send a message when new object are added
QDeclarativeEngineDebugServer: make it a singleton.
Fixed compile error in runonphone.
Fix mispositioned text with QStaticText and OpenVG graphics system
Use binarysort to find items.
Use QImage 'convertInPlace' versions in QVGPixmapData load functions.
QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected
Added an install target to runonphone.
Fix tst_Collections::QTBUG13079_collectionInsideCollection
Fix few declarative code issues discovered by static code analysis
...
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentrun.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentrun.cpp b/src/corelib/concurrent/qtconcurrentrun.cpp index 5a9c755..e80a204 100644 --- a/src/corelib/concurrent/qtconcurrentrun.cpp +++ b/src/corelib/concurrent/qtconcurrentrun.cpp @@ -99,7 +99,7 @@ functions; passing by pointer is useful for calling non-const member functions that modify the instance. - For example, calling QString::split() (a const member function) in a + For example, calling QByteArray::split() (a const member function) in a separate thread is done like this: \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 4 |