diff options
| author | Henrik Hartz <henrik.hartz@nokia.com> | 2010-08-11 08:02:41 (GMT) |
|---|---|---|
| committer | Henrik Hartz <henrik.hartz@nokia.com> | 2010-08-11 08:02:41 (GMT) |
| commit | 9e41bd55cc605f65543e020bb5407c34a043bef9 (patch) | |
| tree | 90d00509544fcdce09e4f9456d4bd7e1e95410d8 /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | ebdc597eea6e44b66d6c98d252531af5d0da04f8 (diff) | |
| parent | 0c1d29300c7248ead3392bb385ceae6889dc2834 (diff) | |
| download | Qt-9e41bd55cc605f65543e020bb5407c34a043bef9.zip Qt-9e41bd55cc605f65543e020bb5407c34a043bef9.tar.gz Qt-9e41bd55cc605f65543e020bb5407c34a043bef9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml 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 |