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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
This commit is contained in:
Eike Ziller
2017-02-20 15:20:14 +01:00
parent 6ba90cd06a 7ee75bf4c2
commit dbb2288f1a
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/projecttree.cpp
View File

@@ -208,10 +208,16 @@ void ProjectTree::update(Node *node, Project *project)
}
}
if (!node && Core::EditorManager::currentDocument()) {
connect(Core::EditorManager::currentDocument(), &Core::IDocument::changed,
this, &ProjectTree::updateExternalFileWarning,
Qt::UniqueConnection);
if (Core::IDocument *document = Core::EditorManager::currentDocument()) {
if (node) {
disconnect(document, &Core::IDocument::changed,
this, &ProjectTree::updateExternalFileWarning);
document->infoBar()->removeInfo(EXTERNAL_FILE_WARNING);
} else {
connect(document, &Core::IDocument::changed,
this, &ProjectTree::updateExternalFileWarning,
Qt::UniqueConnection);
}
}
if (changedNode) {