summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-08-14 16:43:39 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-15 11:38:37 +0200
commit55912e14afabd1594069f0a87c0ccd7502c185b6 (patch)
treeb03f778df78e548d0554c503f601161c5ac8a37b /src/corelib
parentf73e49808dac1db057b418ed8f3579ae175abde6 (diff)
Add a module page for QtConcurrent
Fix some foward references from QtCore in addition. This will require more work. Change-Id: Ib1bade18c2cc220a7afe25e9fca6a3f50cb1174b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/doc/src/threads-basics.qdoc2
-rw-r--r--src/corelib/thread/qthreadpool.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/doc/src/threads-basics.qdoc b/src/corelib/doc/src/threads-basics.qdoc
index 0f455c01e5..7a034ab5f3 100644
--- a/src/corelib/doc/src/threads-basics.qdoc
+++ b/src/corelib/doc/src/threads-basics.qdoc
@@ -163,7 +163,7 @@
\endtable
In general, it is recommended to only use safe and tested paths and to
- avoid introducing ad-hoc threading concepts. QtConcurrent provides an easy
+ avoid introducing ad-hoc threading concepts. The QtConcurrent module provides an easy
interface for distributing work to all of the processor's cores. The
threading code is completely hidden in the QtConcurrent framework, so you
don't have to take care of the details. However, QtConcurrent can't be used
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
index 8545c06ece..abbb683b83 100644
--- a/src/corelib/thread/qthreadpool.cpp
+++ b/src/corelib/thread/qthreadpool.cpp
@@ -392,9 +392,7 @@ void QThreadPoolPrivate::stealRunnable(QRunnable *runnable)
QThreadPool.
Note that QThreadPool is a low-level class for managing threads, see
- QtConcurrent::run() or the other
- \l {Concurrent Programming}{Qt Concurrent} APIs for higher
- level alternatives.
+ the Qt Concurrent module for higher level alternatives.
\sa QRunnable
*/