Merge remote-tracking branch 'origin/4.2'

 Conflicts:
	src/shared/qbs

Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0

1 files changed, 10 insertions, 4 deletions

diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index 1774d8ee0f2..1c115a34897 100644
--- a/src/plugins/projectexplorer/projecttree.cpp
+++ b/src/plugins/projectexplorer/projecttree.cpp
@@ -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) {