summaryrefslogtreecommitdiffstats
path: root/src/concurrent/doc/src
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-10-02 19:24:38 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-10-28 15:38:44 +0100
commitcf043a785ac9357e8f1283ea9e1496261af2b1a5 (patch)
treee85e282dbfb839ab4185c7b44caefe7248509696 /src/concurrent/doc/src
parentbb8c24e467767e35cb104167689b96c0deea5639 (diff)
QtConcurrent: Integrate runWithPromise into run
Change-Id: I6eb95aa66ff847e8bb9aac348fded3a5d55015b6 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/concurrent/doc/src')
-rw-r--r--src/concurrent/doc/src/qtconcurrent-index.qdoc7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/concurrent/doc/src/qtconcurrent-index.qdoc b/src/concurrent/doc/src/qtconcurrent-index.qdoc
index f9b6375b4e..8507d77f9d 100644
--- a/src/concurrent/doc/src/qtconcurrent-index.qdoc
+++ b/src/concurrent/doc/src/qtconcurrent-index.qdoc
@@ -81,15 +81,10 @@
folded into a single result.
\endlist
- \li \l {Concurrent Run and Run With Promise}
+ \li \l {Concurrent Run}
\list
\li \l {QtConcurrent::run}{QtConcurrent::run()} runs a function in
another thread.
- \li \l {QtConcurrent::runWithPromise}{QtConcurrent::runWithPromise()}
- is like run(), except that the function to run accepts additional
- argument of QPromise type that enables more control over the function
- execution, like suspending or canceling the execution when requested,
- progress reporting or reporting multiple results.
\endlist
\li \l {Concurrent Task}