1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mention QPromise in the QFuture docs

Browse Source 
Change-Id: I5f6930116da534dd1dea41c4724c42104de38877
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 0477f6b15a2d71d47c39e52b5da140d19aa76f31)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Sona Kurazyan 2021-03-16 14:55:55 +01:00 committed by Qt Cherry-pick Bot
parent 31cc0df760
commit b106568ec1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/thread/qfuture.qdoc
View File

@ -33,8 +33,6 @@
\ingroup thread \ingroup thread
To start a computation, use one of the APIs in the \l {Qt Concurrent} framework.
QFuture allows threads to be synchronized against one or more results QFuture allows threads to be synchronized against one or more results
which will be ready at a later point in time. The result can be of any type which will be ready at a later point in time. The result can be of any type
that has default, copy and possibly move constructors. If that has default, copy and possibly move constructors. If
@ -138,7 +136,10 @@
be created using convenience functions QtFuture::makeReadyFuture and be created using convenience functions QtFuture::makeReadyFuture and
QtFuture::makeExceptionalFuture. QtFuture::makeExceptionalFuture.
\sa QtFuture::connect(), QtFuture::makeReadyFuture(), \note To start a computation and store results in a QFuture, use QPromise or
one of the APIs in the \l {Qt Concurrent} framework.
\sa QPromise, QtFuture::connect(), QtFuture::makeReadyFuture(),
QtFuture::makeExceptionalFuture(), QFutureWatcher, {Qt Concurrent} QtFuture::makeExceptionalFuture(), QFutureWatcher, {Qt Concurrent}
*/ */