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: Iebd340258966aff910fb9ab0e45b5149e8f242f0
This commit is contained in:
Eike Ziller
2017-10-12 09:49:14 +02:00
parent 845271e957 cd575e3a76
commit 1c1dd45bfe
73 changed files with 3874 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,14 +394,19 @@ void SessionManager::addProject(Project *pro)
emit m_instance->projectAdded(pro);
const auto updateFolderNavigation = [pro] {
const QIcon icon = pro->rootProjectNode() ? pro->rootProjectNode()->icon() : QIcon();
FolderNavigationWidgetFactory::insertRootDirectory({projectFolderId(pro),
PROJECT_SORT_VALUE,
pro->displayName(),
pro->projectFilePath().parentDir()});
pro->projectFilePath().parentDir(),
icon});
};
updateFolderNavigation();
configureEditors(pro);
connect(pro, &Project::fileListChanged, [pro](){ configureEditors(pro); });
connect(pro, &Project::fileListChanged, [pro, updateFolderNavigation]() {
configureEditors(pro);
updateFolderNavigation(); // update icon
});
connect(pro, &Project::displayNameChanged, pro, updateFolderNavigation);
if (!startupProject())