From 45a6f60aaf2c8070359fb27f20bb6b06c74d0a4e Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Tue, 16 Mar 2021 14:55:55 +0100 Subject: [PATCH] Mention QPromise in the QFuture docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5f6930116da534dd1dea41c4724c42104de38877 Reviewed-by: Paul Wicking (cherry picked from commit 0477f6b15a2d71d47c39e52b5da140d19aa76f31) Reviewed-by: Mårten Nordheim --- src/corelib/thread/qfuture.qdoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 8fec4989bbd..335c16a39cf 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 QFuture::QFuture()