diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-09-15 09:23:23 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 16:40:23 +0200 |
| commit | edf1a5706eebb6f2df14c5f524c7261f88d6cd75 (patch) | |
| tree | 781a72ccc204e0391abedea323b0b9eb42d92e2a /src/concurrent | |
| parent | 14bcdce819e372b38e83055a08a52a0c423a8b4d (diff) | |
Doc: Remove duplicated Qt Concurrent overview
- The "Concurrent Programming" page is an exact duplicate of the Qt Concurrent module landing
page.
- The "qtconcurrent intro" target is not referenced anywhere.
Change-Id: Ice9b4360783013fe972258ca54a0004be43b8766
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/qtconcurrentfilter.cpp | 2 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentmap.cpp | 6 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentrun.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp index ef0229a695..7889fbff56 100644 --- a/src/concurrent/qtconcurrentfilter.cpp +++ b/src/concurrent/qtconcurrentfilter.cpp @@ -47,7 +47,7 @@ \brief The <QtConcurrentFilter> header provides concurrent Filter and Filter-Reduce. - 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::filter(), QtConcurrent::filtered() and QtConcurrent::filteredReduced() functions filter items in a sequence such diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp index 9718baf48f..da2a601ae2 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 diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp index 4ab1399c0c..4398e1a91f 100644 --- a/src/concurrent/qtconcurrentrun.cpp +++ b/src/concurrent/qtconcurrentrun.cpp @@ -48,7 +48,7 @@ \ingroup thread - This function is a part of the \l {Concurrent Programming}{Qt Concurrent} framework. + This function is a part of the \l {Qt Concurrent} framework. The QtConcurrent::run() function runs a function in a separate thread. The return value of the function is made available through the QFuture API. |