diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-09 12:28:26 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-09 12:28:26 (GMT) |
| commit | 725ee520b7e30c22e3c66e2524b718f4da8222d8 (patch) | |
| tree | bba69f5462824d34845508de0add650c92532510 /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | 6648d81c880012bad52380bd73bbe92d68260f7e (diff) | |
| parent | 662f87ad52ea75229ce18b19983890425cc45298 (diff) | |
| download | Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.zip Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.tar.gz Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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 e74d69c..4303ff6 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -161,7 +161,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::mappedReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. If QtConcurrent::UnorderedReduce is used (the default), the order is undefined, while QtConcurrent::OrderedReduce ensures that the reduction |