diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 05:39:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 05:39:18 (GMT) |
| commit | ad957b76682dfddb2576154f56b5017680819eef (patch) | |
| tree | e12ae2d804b4775135851fd6a4d0db4d598519b8 /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | 74871dc5730c8a44e71ee9efcf47f94384f36387 (diff) | |
| parent | 95e55e6bbfaf76166b64e7f57c612826afd19a86 (diff) | |
| download | Qt-ad957b76682dfddb2576154f56b5017680819eef.zip Qt-ad957b76682dfddb2576154f56b5017680819eef.tar.gz Qt-ad957b76682dfddb2576154f56b5017680819eef.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typos fixed
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentmap.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index 39a13fb..e74d69c 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -70,7 +70,7 @@ \value UnorderedReduce Reduction is done in an arbitrary order. \value OrderedReduce Reduction is done in the order of the original sequence. - \value SequentialReduce Reduction is done sequentally: only one + \value SequentialReduce Reduction is done sequentially: only one thread will enter the reduce function at a time. (Parallel reduction might be supported in a future version of Qt Concurrent.) */ |