summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppprojectupdater.cpp
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2021-05-05 10:40:43 +0200
committerDavid Schulz <david.schulz@qt.io>2021-05-07 11:28:05 +0000
commit7fb592fe0cfec22ae7e966b9c6b88aa801bf9592 (patch)
tree84885caaab1b6857194fe23ba7040fdb56eccfe3 /src/plugins/cpptools/cppprojectupdater.cpp
parentd7c659fa87e8052b25bff98c8c127ae1bc34753e (diff)
downloadqt-creator-7fb592fe0cfec22ae7e966b9c6b88aa801bf9592.tar.gz
CppTools: Fix UI freeze on project update
Do not wait for the previous update to finish before starting the next update. Amends: 6d7e5eb8d17194b124c8986d670ff96fda96f0f3 Change-Id: Ic8d43b56949cbf024832afc85e54a31db29b11ac Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppprojectupdater.cpp')
-rw-r--r--src/plugins/cpptools/cppprojectupdater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppprojectupdater.cpp b/src/plugins/cpptools/cppprojectupdater.cpp
index f0b0bda090..567aabde5e 100644
--- a/src/plugins/cpptools/cppprojectupdater.cpp
+++ b/src/plugins/cpptools/cppprojectupdater.cpp
@@ -53,7 +53,7 @@ CppProjectUpdater::~CppProjectUpdater()
void CppProjectUpdater::update(const ProjectExplorer::ProjectUpdateInfo &projectUpdateInfo)
{
// Stop previous update.
- cancelAndWaitForFinished();
+ cancel();
m_projectUpdateInfo = projectUpdateInfo;
@@ -93,7 +93,7 @@ void CppProjectUpdater::onToolChainRemoved(ProjectExplorer::ToolChain *t)
{
QTC_ASSERT(t, return);
if (t == m_projectUpdateInfo.cToolChain || t == m_projectUpdateInfo.cxxToolChain)
- cancelAndWaitForFinished();
+ cancel();
}
void CppProjectUpdater::onProjectInfoGenerated()