diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-23 15:20:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-23 15:20:42 (GMT) |
| commit | d405aa6510514ce02b312994db55c305bde60285 (patch) | |
| tree | f64ba2531bc2eb99149ffdc13a4c0776df8bab25 /src | |
| parent | 168ae6571dc93ee11fc0f61db643fb7679bb729f (diff) | |
| parent | 42a9fe3042945937839eda3578655ca091422b28 (diff) | |
| download | Qt-d405aa6510514ce02b312994db55c305bde60285.zip Qt-d405aa6510514ce02b312994db55c305bde60285.tar.gz Qt-d405aa6510514ce02b312994db55c305bde60285.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: QtConcurrent::run. Make sure the example actually compiles
Diffstat (limited to 'src')
| -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 |