From 919acf578673cbb0c75b53ccd21615df513ac8cc Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 21 Mar 2011 18:27:54 +0100
Subject: [PATCH] ProjectExplorer: Move dependencies update a little further up
Task-Nr: QTCREATORBUG-4168
---
src/plugins/projectexplorer/session.cpp | 41 +++++++++++++------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 306e933cf37..0f11fe7b2ae 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -873,26 +873,6 @@ void SessionManager::removeProjects(QList<Project *> remove)
emit aboutToRemoveProject(pro);
}
- // TODO: Clear m_modelProjectHash
-
- // Delete projects
- foreach (Project *pro, remove) {
- pro->saveSettings();
- m_file->m_projects.removeOne(pro);
-
- if (pro == m_file->m_startupProject)
- setStartupProject(0);
-
- disconnect(pro, SIGNAL(fileListChanged()),
- this, SLOT(clearProjectFileCache()));
- m_projectFileCache.remove(pro);
-
- if (debug)
- qDebug() << "SessionManager - emitting projectRemoved(" << pro->displayName() << ")";
- m_sessionNode->removeProjectNode(pro->rootProjectNode());
- emit projectRemoved(pro);
- delete pro;
- }
// Refresh dependencies
QSet<QString> projectFiles;
@@ -915,6 +895,27 @@ void SessionManager::removeProjects(QList<Project *> remove)
m_file->m_depMap = resMap;
+ // TODO: Clear m_modelProjectHash
+
+ // Delete projects
+ foreach (Project *pro, remove) {
+ pro->saveSettings();
+ m_file->m_projects.removeOne(pro);
+
+ if (pro == m_file->m_startupProject)
+ setStartupProject(0);
+
+ disconnect(pro, SIGNAL(fileListChanged()),
+ this, SLOT(clearProjectFileCache()));
+ m_projectFileCache.remove(pro);
+
+ if (debug)
+ qDebug() << "SessionManager - emitting projectRemoved(" << pro->displayName() << ")";
+ m_sessionNode->removeProjectNode(pro->rootProjectNode());
+ emit projectRemoved(pro);
+ delete pro;
+ }
+
if (startupProject() == 0)
if (!m_file->m_projects.isEmpty())
setStartupProject(m_file->m_projects.first());
--
GitLab