diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-03-16 14:55:55 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-03-17 09:34:07 +0100 |
| commit | 45a6f60aaf2c8070359fb27f20bb6b06c74d0a4e (patch) | |
| tree | 246133ae3d96c6dc6cf29153a08516ec34ae8d22 /src | |
| parent | 57b59e46283993d909c575fe52c1d2625d7d0e6b (diff) | |
Mention QPromise in the QFuture docs
Change-Id: I5f6930116da534dd1dea41c4724c42104de38877
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 0477f6b15a2d71d47c39e52b5da140d19aa76f31)
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qfuture.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 8fec4989bb..335c16a39c 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -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 @@ -134,7 +132,10 @@ you can attach multiple continuations to a signal, which are invoked in the same thread or a new thread. - \sa QtFuture::connect(), QFutureWatcher, {Qt Concurrent} + \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(), QFutureWatcher, {Qt Concurrent} */ /*! \fn template <typename T> QFuture<T>::QFuture() |