From 6d7e5eb8d17194b124c8986d670ff96fda96f0f3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 10 Nov 2020 17:55:54 +0100 Subject: Fix CppProjectUpdater cancelAndWaitForFinished The code was pushing an additional QFutureInterface through the whole chain of functions, which was used for canceling. But since it was never started (and never finished, and never used for reporting results), calling waitForFinshed on it never had any effect with Qt5 and locks up with Qt6. Instead of using a separate QFutureInterface, use the actual QFuture that is available and intended for it. Fixes: QTCREATORBUG-24902 Change-Id: I5a49bcecc9cf70fbffa93aee4293004f9369df58 Reviewed-by: Jarek Kobus Reviewed-by: Christian Kandeler --- src/plugins/cpptools/cppprojectupdater.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cppprojectupdater.h') diff --git a/src/plugins/cpptools/cppprojectupdater.h b/src/plugins/cpptools/cppprojectupdater.h index 8167b071cf..62e64a1dae 100644 --- a/src/plugins/cpptools/cppprojectupdater.h +++ b/src/plugins/cpptools/cppprojectupdater.h @@ -67,7 +67,8 @@ private: private: ProjectExplorer::ProjectUpdateInfo m_projectUpdateInfo; - QFutureInterface m_futureInterface; + QFuture m_generateFuture; + QFuture m_updateFuture; QFutureWatcher m_generateFutureWatcher; }; -- cgit v1.2.1