diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-11 03:59:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-11 03:59:15 (GMT) |
| commit | b63d7dc74b30b741c6481fb41d8bb3951a9bd763 (patch) | |
| tree | 22b22c6e45124e5f9a0a73109debcd6df67716e4 /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20 (diff) | |
| parent | cc2fe3a5e2a748a8284ee732befc6a25d193f0c0 (diff) | |
| download | Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.zip Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.tar.gz Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.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 |