From 1cbb4cc9546c58cec3c3e759b8cbc7bac67ac708 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 2 May 2016 12:57:30 +0200
Subject: [PATCH] QbsProjectManager: Fix SOFT ASSERT: "future.isFinished()"

...in file qbsproject.cpp, line 940.

The assert can be triggered with e.g.:
 1. Load a bigger qbs project, e.g. qtcreator.qbs.
 2. Trigger project build as soon as possible.
 3. Cancel the "Parsing C/C++" operation.
 4. Wait until the build finished and the assert occurs.

This happens because CppModelManager::updateProjectInfo() since

  commit  536ccc8a8742b38e75547d98ce457b0b90af3ee7
  CppTools: Fix incompletely indexed project

will check whether the previous indexer run was canceled or not. If it
was canceled, it will trigger a full-reindexing of the project.

Updating the compiler call data is a special case and it should never
trigger an indexing operation, so introduce a dedicated update function
for this case.

Change-Id: I456945ccf2bf697aaeada572ed87f3acb21a5eaf
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cpptools/cppmodelmanager.cpp     | 13 +++++++++++++
 src/plugins/cpptools/cppmodelmanager.h       |  4 +++-
 src/plugins/qbsprojectmanager/qbsproject.cpp |  4 +---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 2ffd37c14e5..08ee406fc89 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -900,6 +900,19 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn
     return indexerFuture;
 }
 
+ProjectInfo CppModelManager::updateCompilerCallDataForProject(
+        ProjectExplorer::Project *project,
+        ProjectInfo::CompilerCallData &compilerCallData)
+{
+    QMutexLocker locker(&d->m_projectMutex);
+
+    ProjectInfo projectInfo = d->m_projectToProjectsInfo.value(project, ProjectInfo());
+    projectInfo.setCompilerCallData(compilerCallData);
+    d->m_projectToProjectsInfo.insert(project, projectInfo);
+
+    return projectInfo;
+}
+
 ProjectPart::Ptr CppModelManager::projectPartForId(const QString &projectPartId) const
 {
     return d->m_projectPartIdToProjectProjectPart.value(projectPartId);
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 3a42c650344..2e296ef6390 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -29,6 +29,7 @@
 #include "cpptools_global.h"
 
 #include "cppmodelmanagersupport.h"
+#include "projectinfo.h"
 #include "projectpart.h"
 #include "projectpartheaderpath.h"
 
@@ -56,7 +57,6 @@ class CppEditorDocumentHandle;
 class CppIndexingSupport;
 class SymbolFinder;
 class WorkingCopy;
-class ProjectInfo;
 
 namespace Internal {
 class CppSourceProcessor;
@@ -95,6 +95,8 @@ public:
     QList<ProjectInfo> projectInfos() const;
     ProjectInfo projectInfo(ProjectExplorer::Project *project) const;
     QFuture<void> updateProjectInfo(const ProjectInfo &newProjectInfo);
+    ProjectInfo updateCompilerCallDataForProject(ProjectExplorer::Project *project,
+                                                 ProjectInfo::CompilerCallData &compilerCallData);
 
     /// \return The project part with the given project file
     ProjectPart::Ptr projectPartForId(const QString &projectPartId) const;
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 51928b7a87c..b9f6556d108 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -935,9 +935,7 @@ void QbsProject::updateCppCompilerCallData()
         }
     }
 
-    m_codeModelProjectInfo.setCompilerCallData(data);
-    const QFuture<void> future = modelManager->updateProjectInfo(m_codeModelProjectInfo);
-    QTC_CHECK(future.isFinished()); // No reparse of files expected
+    m_codeModelProjectInfo = modelManager->updateCompilerCallDataForProject(this, data);
 }
 
 void QbsProject::updateQmlJsCodeModel()