Merge remote-tracking branch 'origin/5.0' into 6.0

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I87b19a51b1950d19eff95086848b0728ba2f0ebd

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -110,6 +110,7 @@ QmlJSEditorPlugin::QmlJSEditorPlugin()
 
 QmlJSEditorPlugin::~QmlJSEditorPlugin()
 {
+    delete QmlJS::Icons::instance(); // delete object held by singleton
     delete d;
     d = nullptr;
     m_instance = nullptr;
@@ -226,8 +227,6 @@ void QmlJSEditorPlugin::extensionsInitialized()
 
 ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
 {
-    delete QmlJS::Icons::instance(); // delete object held by singleton
-
     return IPlugin::aboutToShutdown();
 }