diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-11-10 17:55:54 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-11 12:49:33 +0000 |
commit | 6d7e5eb8d17194b124c8986d670ff96fda96f0f3 (patch) | |
tree | d798aee5f50a97d59dd3458afdceb04c0978fbe7 /tests | |
parent | 557a09ba4c4c232f1f7095ed9c6889f0abc919f0 (diff) |
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 <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/unittest/cppprojectinfogenerator-test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/unittest/cppprojectinfogenerator-test.cpp b/tests/unit/unittest/cppprojectinfogenerator-test.cpp index ceb3c8b8aa..98eb8feeaa 100644 --- a/tests/unit/unittest/cppprojectinfogenerator-test.cpp +++ b/tests/unit/unittest/cppprojectinfogenerator-test.cpp @@ -163,7 +163,7 @@ void ProjectInfoGenerator::SetUp() ProjectInfo ProjectInfoGenerator::generate() { - QFutureInterface<void> fi; + QFutureInterface<ProjectInfo> fi; ProjectExplorer::ConcreteToolChain aToolChain; projectUpdateInfo.rawProjectParts += rawProjectPart; |