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/imageviewer/imageviewerfile.cpp

@@ -126,7 +126,15 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString,
         m_type = TypeMovie;
         m_movie = new QMovie(fileName, QByteArray(), this);
         m_movie->setCacheMode(QMovie::CacheAll);
-        connect(m_movie, &QMovie::finished, m_movie, &QMovie::start);
+        connect(
+            m_movie,
+            &QMovie::finished,
+            m_movie,
+            [this] {
+                if (m_movie->isValid())
+                    m_movie->start();
+            },
+            Qt::QueuedConnection);
         connect(m_movie, &QMovie::resized, this, &ImageViewerFile::imageSizeChanged);
         m_movie->start();
         m_isPaused = false; // force update

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();
 }