Merge "Mention QPromise in the QFuture docs"
This commit is contained in:
commit
2eec7db03d
@ -33,8 +33,6 @@
|
||||
|
||||
\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
|
||||
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
|
||||
@ -138,7 +136,10 @@
|
||||
be created using convenience functions QtFuture::makeReadyFuture and
|
||||
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}
|
||||
*/
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user