summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qfuturewatcher_p.h
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2021-07-21 10:59:44 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2021-07-23 09:32:54 +0200
commit53e4a50c6b3c7359b9afc24f30c9517abdf9561a (patch)
tree1b1595b8583d65c9d90f0030d9a5d30c5618bedb /src/corelib/thread/qfuturewatcher_p.h
parent640c5ca088319d9a372072c180eef35c80a552e8 (diff)
Make QFutureWatcher::isFinished() consistent with the watched QFuture
All the getters of QFutureWatcher are consistent with the getters of the corresponding QFuture, except for the isFinished() method, which returns 'true' only after the finished() signal is delivered. This behavior might be unintuitive for the users. In particular, isFinished() returns 'false', even if it's called immediately after waitForFinished(). [ChangeLog][QtCore][QFutureWatcher][Important Behavior Changes] The QFutureWatcher::isFinished() method now indicates if the related QFuture is finished, instead of indicating if the finished() signal was delivered. This makes it consistent with the future that is being watched. Fixes: QTBUG-91048 Pick-to: 6.1 6.2 Change-Id: I6ae9b882b23e06198a82c95b026491bd480b3bf0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/thread/qfuturewatcher_p.h')
-rw-r--r--src/corelib/thread/qfuturewatcher_p.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/thread/qfuturewatcher_p.h b/src/corelib/thread/qfuturewatcher_p.h
index b086b88773..f9a628e4fb 100644
--- a/src/corelib/thread/qfuturewatcher_p.h
+++ b/src/corelib/thread/qfuturewatcher_p.h
@@ -78,7 +78,6 @@ public:
int maximumPendingResultsReady;
QAtomicInt resultAtConnected;
- bool finished;
};
QT_END_NAMESPACE