feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Move dependencies update a little further up

Browse Source 
Task-Nr: QTCREATORBUG-4168
This commit is contained in:
dt
2011-03-21 18:27:54 +01:00
parent dcae06a5c5
commit 919acf5786
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/projectexplorer/session.cpp
View File

@@ -873,26 +873,6 @@ void SessionManager::removeProjects(QList<Project *> remove)
emit aboutToRemoveProject(pro); 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 // Refresh dependencies
QSet<QString> projectFiles; QSet<QString> projectFiles;
@@ -915,6 +895,27 @@ void SessionManager::removeProjects(QList<Project *> remove)
m_file->m_depMap = resMap; 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 (startupProject() == 0)
if (!m_file->m_projects.isEmpty()) if (!m_file->m_projects.isEmpty())
setStartupProject(m_file->m_projects.first()); setStartupProject(m_file->m_projects.first());