From b8dcaa455e8b8139634a1992a30b11295d627378 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 14 Nov 2018 13:46:49 +0100
Subject: [PATCH] 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>
---
 src/libs/tracing/timelinetracemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp
index 9504d7d60ad..d9bad87cba0 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;
 }