From b106568ec1f08ac4906cc4387eb4d278f19092ec 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 Change-Id: I5f6930116da534dd1dea41c4724c42104de38877 Reviewed-by: Paul Wicking (cherry picked from commit 0477f6b15a2d71d47c39e52b5da140d19aa76f31) Reviewed-by: Qt Cherry-pick Bot --- 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 b81944200e4..fd3120ff153 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 @@ -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} */