Merge remote-tracking branch 'origin/4.11'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21

src/plugins/python/pythonutils.cpp

@@ -31,6 +31,7 @@
 #include "pythonrunconfiguration.h"
 #include "pythonsettings.h"
 
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
@@ -446,7 +447,16 @@ void PyLSConfigureAssistant::resetEditorInfoBar(TextEditor::TextDocument *docume
 
 PyLSConfigureAssistant::PyLSConfigureAssistant(QObject *parent)
     : QObject(parent)
-{}
+{
+    Core::EditorManager::instance();
+    connect(Core::EditorManager::instance(),
+            &Core::EditorManager::documentClosed,
+            this,
+            [this](Core::IDocument *document) {
+                if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document))
+                    resetEditorInfoBar(textDocument);
+            });
+}
 
 } // namespace Internal
 } // namespace Python