Merge remote-tracking branch 'origin/3.6'

 Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75

1 files changed, 1 insertions, 13 deletions

diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 4517bd8e9f..cdf5922e42 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -326,8 +326,6 @@ CppModelManager::CppModelManager(QObject *parent)
             this, SLOT(onAboutToRemoveProject(ProjectExplorer::Project*)));
     connect(sessionManager, SIGNAL(aboutToLoadSession(QString)),
             this, SLOT(onAboutToLoadSession()));
-    connect(sessionManager, SIGNAL(aboutToUnloadSession(QString)),
-            this, SLOT(onAboutToUnloadSession()));
 
     connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
             this, &CppModelManager::onCurrentEditorChanged);
@@ -1021,17 +1019,6 @@ void CppModelManager::onAboutToLoadSession()
     GC();
 }
 
-void CppModelManager::onAboutToUnloadSession()
-{
-    Core::ProgressManager::cancelTasks(CppTools::Constants::TASK_INDEX);
-    do {
-        QMutexLocker locker(&d->m_projectMutex);
-        d->m_projectToProjectsInfo.clear();
-        recalculateProjectPartMappings();
-        d->m_dirty = true;
-    } while (0);
-}
-
 void CppModelManager::renameIncludes(const QString &oldFileName, const QString &newFileName)
 {
     if (oldFileName.isEmpty() || newFileName.isEmpty())
@@ -1063,6 +1050,7 @@ void CppModelManager::renameIncludes(const QString &oldFileName, const QString &
 
 void CppModelManager::onCoreAboutToClose()
 {
+    Core::ProgressManager::cancelTasks(CppTools::Constants::TASK_INDEX);
     d->m_enableGC = false;
 }