summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-06-20 07:50:44 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-20 07:50:44 +0200
commitbd9959bde290168b0635cb878d7d189e1f9c4b4f (patch)
tree1a4d5a0eff8d6acaff26ae4ff4ded8ca71b76a06 /src/concurrent
parentb877285694501d16b2bb0dc8d1a92e185b079b87 (diff)
parent6398588338dfea4161704e01216ba70b216a7a0b (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/network/ssl/qsslsocket_openssl.cpp src/widgets/styles/qstylesheetstyle.cpp Change-Id: Ibe1cd40f46a823c9e5edbe0a3cd16be1e1686b17
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/qtconcurrentrun.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp
index bbd1f5ec62..d9867e1f1a 100644
--- a/src/concurrent/qtconcurrentrun.cpp
+++ b/src/concurrent/qtconcurrentrun.cpp
@@ -138,10 +138,10 @@
T is the same type as the return value of \a function. Non-void return
values can be accessed via the QFuture::result() function.
- Note that the QFuture returned by QtConcurrent::run() does not support
- canceling, pausing, or progress reporting. The QFuture returned can only
- be used to query for the running/finished status and the return value of
- the function.
+ \note The QFuture returned can only be used to query for the
+ running/finished status and the return value of the function. In particular,
+ canceling or pausing can be issued only if the computations behind the future
+ has not been started.
\sa {Concurrent Run}
*/
@@ -157,10 +157,10 @@
T is the same type as the return value of \a function. Non-void return
values can be accessed via the QFuture::result() function.
- Note that the QFuture returned by QtConcurrent::run() does not support
- canceling, pausing, or progress reporting. The QFuture returned can only
- be used to query for the running/finished status and the return value of
- the function.
+ \note The QFuture returned can only be used to query for the
+ running/finished status and the return value of the function. In particular,
+ canceling or pausing can be issued only if the computations behind the future
+ has not been started.
\sa {Concurrent Run}
*/