diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:32:39 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:33:15 +0200 |
| commit | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (patch) | |
| tree | bb3b8b902f13bda65e49485a789f0eca07329ab5 /src/concurrent/qtconcurrentmap.cpp | |
| parent | 5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 (diff) | |
| parent | a23ff58d716f62b02ec825a3ea3c6b07616ee3f0 (diff) | |
Merge branch 'stable' into dev
Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
Diffstat (limited to 'src/concurrent/qtconcurrentmap.cpp')
| -rw-r--r-- | src/concurrent/qtconcurrentmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp index 9718baf48fc..da2a601ae27 100644 --- a/src/concurrent/qtconcurrentmap.cpp +++ b/src/concurrent/qtconcurrentmap.cpp @@ -47,8 +47,8 @@ possible to write multi-threaded programs without using low-level threading primitives. - See the \l {Concurrent Programming}{Qt Concurrent} chapter in - the \l{threads.html}{threading} documentation. + See the \l {Qt Concurrent} module documentation for an overview of available + functions, or see below for detailed information on each function. \inheaderfile QtConcurrent \ingroup thread @@ -74,7 +74,7 @@ \brief The <QtConcurrentMap> header provides concurrent Map and MapReduce. - These functions are a part of the \l {Concurrent Programming}{Qt Concurrent} framework. + These functions are a part of the \l {Qt Concurrent} framework. The QtConcurrent::map(), QtConcurrent::mapped() and QtConcurrent::mappedReduced() functions run computations in parallel on |