Cancel code model indexing on project closing and full code model update

Task-Nr: QTCREATORBUG-1151

1 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 85f49091387..0f973cd71a2 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -85,6 +85,7 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
 
 CMakeProject::~CMakeProject()
 {
+    m_codeModelFuture.cancel();
     delete m_rootNode;
 }
 
@@ -257,7 +258,8 @@ bool CMakeProject::parseCMakeLists()
             pinfo.defines = activeBC->toolChain()->predefinedMacros(); // TODO this is to simplistic
             pinfo.frameworkPaths = allFrameworkPaths;
             modelmanager->updateProjectInfo(pinfo);
-            modelmanager->updateSourceFiles(pinfo.sourceFiles);
+            m_codeModelFuture.cancel();
+            m_codeModelFuture = modelmanager->updateSourceFiles(pinfo.sourceFiles);
         }
     }