summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-11-14 13:46:49 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-11-14 13:37:22 +0000
commitb8dcaa455e8b8139634a1992a30b11295d627378 (patch)
treeee4f93adacb8de55be85df8311e9782d6e91b3ce
parentefe30bc5a5abf7c3777a64e648f0b3d25d6595f7 (diff)
downloadqt-creator-b8dcaa455e8b8139634a1992a30b11295d627378.tar.gz
Tracing: Only call QFutureWatcher::setFuture() after connecting to it
Fixes: QTCREATORBUG-21485 Change-Id: Icc44cf0195775d31934a60cb064addc94b152d92 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/tracing/timelinetracemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp
index 9504d7d60a..d9bad87cba 100644
--- a/src/libs/tracing/timelinetracemanager.cpp
+++ b/src/libs/tracing/timelinetracemanager.cpp
@@ -283,7 +283,6 @@ QFuture<void> TimelineTraceManager::load(const QString &filename)
});
QFutureWatcher<void> *watcher = new QFutureWatcher<void>(reader);
- watcher->setFuture(future);
connect(watcher, &QFutureWatcherBase::canceled, this, &TimelineTraceManager::clearAll);
connect(watcher, &QFutureWatcherBase::finished, this, [this, reader]() {
if (!reader->isCanceled()) {
@@ -294,6 +293,7 @@ QFuture<void> TimelineTraceManager::load(const QString &filename)
finalize();
}
});
+ watcher->setFuture(future);
return future;
}