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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1020,10 +1020,15 @@ bool SessionManager::loadSession(const QString &session)
}
// find a list of projects to close later
const QList<Project *> oldProjects = Utils::filtered(projects(), [&fileList](Project *p) {
return !fileList.contains(p->projectFilePath().toString());
const QList<Project *> projectsToRemove = Utils::filtered(projects(), [&fileList](Project *p) {
return !fileList.contains(p->projectFilePath().toString());
});
const QList<Project *> openProjects = projects();
const QStringList projectPathsToLoad = Utils::filtered(fileList, [&openProjects](const QString &path) {
return !Utils::contains(openProjects, [&path](Project *p) {
return p->projectFilePath().toString() == path;
});
});
d->m_failedProjects.clear();
d->m_depMap.clear();
d->m_values.clear();
@@ -1055,19 +1060,19 @@ bool SessionManager::loadSession(const QString &session)
if (c.isValid())
StyleHelper::setBaseColor(c);
d->m_future.setProgressRange(0, fileList.count() + 1/*initialization above*/ + 1/*editors*/);
d->m_future.setProgressRange(0, projectPathsToLoad.count() + 1/*initialization above*/ + 1/*editors*/);
d->m_future.setProgressValue(1);
// if one processEvents doesn't get the job done
// just use two!
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
d->restoreProjects(fileList);
d->restoreProjects(projectPathsToLoad);
d->sessionLoadingProgress();
d->restoreDependencies(reader);
d->restoreStartupProject(reader);
removeProjects(oldProjects); // only remove old projects now that the startup project is set!
removeProjects(projectsToRemove); // only remove old projects now that the startup project is set!
d->restoreEditors(reader);
@@ -1082,6 +1087,7 @@ bool SessionManager::loadSession(const QString &session)
ModeManager::activateMode(modeId);
ModeManager::setFocusToCurrentMode();
} else {
removeProjects(projects());
ModeManager::activateMode(Id(Core::Constants::MODE_EDIT));
ModeManager::setFocusToCurrentMode();
}