Merge remote-tracking branch 'origin/4.0'

Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667

56 files changed, 80 insertions, 69 deletions

diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index 4701e126a66..9b5d59258ff 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -638,7 +638,7 @@ void TestTreeModel::markForRemoval(const QString &filePath)
                 for ( ; grandChildRow >= 0; --grandChildRow) {
                     TestTreeItem *grandChild = child->childItem(grandChildRow);
                     if (grandChild->filePath() == filePath) {
-                        grandChild->markForRemoval(true);
+                        grandChild->markForRemovalRecursively(true);
                     }
                 }
             }
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index 3b72700c9f7..1d89aeef9a2 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -155,11 +155,10 @@ QIcon icon(QFileIconProvider::IconType type)
   */
 QPixmap overlayIcon(const QPixmap &baseIcon, const QIcon &overlayIcon)
 {
-    QPixmap iconPixmap = baseIcon;
-    QPainter painter(&iconPixmap);
-    painter.drawPixmap(0, 0, overlayIcon.pixmap(baseIcon.size()));
-    painter.end();
-    return iconPixmap;
+    QPixmap result = baseIcon;
+    QPainter painter(&result);
+    overlayIcon.paint(&painter, QRect(QPoint(), result.size() / result.devicePixelRatio()));
+    return result;
 }
 
 /*!
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 76959a74488..4d362aba8e1 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -116,7 +116,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi
       m_engine(engine),
       m_running(false)
 {
-    setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL);
+    setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR);
     connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished);
 
     connect(engine, &DebuggerEngine::requestRemoteSetup,
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 0a35709c9db..6c6cd5f900e 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -46,6 +46,4 @@ equals(TEST, 1) {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
-RESOURCES += designer.qrc
-
 DISTFILES += README.txt
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index fe007e8c968..ae6a9a996bd 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -29,7 +29,6 @@ QtcPlugin {
         files: [
             "README.txt",
             "codemodelhelpers.cpp", "codemodelhelpers.h",
-            "designer.qrc",
             "designer_export.h",
             "designerconstants.h",
             "designercontext.cpp", "designercontext.h",
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index 4f611ad42a2..1fa9bc648d4 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -29,6 +29,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/fileiconprovider.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -45,7 +46,7 @@ FormEditorFactory::FormEditorFactory()
     setDisplayName(qApp->translate("Designer", C_DESIGNER_XML_DISPLAY_NAME));
     addMimeType(FORM_MIMETYPE);
 
-    FileIconProvider::registerIconOverlayForSuffix(":/formeditor/images/qt_ui.png", "ui");
+    FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_UI, "ui");
 }
 
 IEditor *FormEditorFactory::createEditor()
diff --git a/src/plugins/designer/images/qt_ui.png b/src/plugins/designer/images/qt_ui.png
deleted file mode 100644
index f4b723482a7..00000000000
--- a/src/plugins/designer/images/qt_ui.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 9ea9547fbfe..ff039419204 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -180,7 +180,7 @@ AppOutputPane::AppOutputPane() :
     // Attach
     m_attachButton->setToolTip(msgAttachDebuggerTooltip());
     m_attachButton->setEnabled(false);
-    m_attachButton->setIcon(Icons::DEBUG_START_SMALL.icon());
+    m_attachButton->setIcon(Icons::DEBUG_START_SMALL_TOOLBAR.icon());
     m_attachButton->setAutoRaise(true);
 
     connect(m_attachButton, &QAbstractButton::clicked,
diff --git a/src/plugins/projectexplorer/images/fileoverlay_cpp.png b/src/plugins/projectexplorer/images/fileoverlay_cpp.png
new file mode 100644
index 00000000000..09e11e01b7d
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_cpp.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_cpp@2x.png b/src/plugins/projectexplorer/images/fileoverlay_cpp@2x.png
new file mode 100644
index 00000000000..6fd784f694d
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_cpp@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_h.png b/src/plugins/projectexplorer/images/fileoverlay_h.png
new file mode 100644
index 00000000000..8b2d16522a9
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_h.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_h@2x.png b/src/plugins/projectexplorer/images/fileoverlay_h@2x.png
new file mode 100644
index 00000000000..5cc5bc677db
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_h@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qml.png b/src/plugins/projectexplorer/images/fileoverlay_qml.png
new file mode 100644
index 00000000000..ff9d0764017
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qml.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qml@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qml@2x.png
new file mode 100644
index 00000000000..d7e67599f00
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qml@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qrc.png b/src/plugins/projectexplorer/images/fileoverlay_qrc.png
new file mode 100644
index 00000000000..b0c501397d0
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qrc.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png
new file mode 100644
index 00000000000..0133e39f316
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qt.png b/src/plugins/projectexplorer/images/fileoverlay_qt.png
new file mode 100644
index 00000000000..5db696e64fb
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qt.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_qt@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qt@2x.png
new file mode 100644
index 00000000000..a078e4ab1c0
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_qt@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_scxml.png b/src/plugins/projectexplorer/images/fileoverlay_scxml.png
new file mode 100644
index 00000000000..6e51f623491
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_scxml.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png b/src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png
new file mode 100644
index 00000000000..275b100ee5a
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_ui.png b/src/plugins/projectexplorer/images/fileoverlay_ui.png
new file mode 100644
index 00000000000..ee09be52832
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_ui.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_ui@2x.png b/src/plugins/projectexplorer/images/fileoverlay_ui@2x.png
new file mode 100644
index 00000000000..918bec03189
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_ui@2x.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_unknown.png b/src/plugins/projectexplorer/images/fileoverlay_unknown.png
new file mode 100644
index 00000000000..3583c35e96c
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_unknown.png
diff --git a/src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png b/src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png
new file mode 100644
index 00000000000..d7616e16247
--- /dev/null
+++ b/src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 15513cd5645..865483c57d2 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -69,5 +69,21 @@
         <file>images/targetchangebutton2@2x.png</file>
         <file>images/desktopdevice.png</file>
         <file>images/desktopdevice@2x.png</file>
+        <file>images/fileoverlay_qml.png</file>
+        <file>images/fileoverlay_qml@2x.png</file>
+        <file>images/fileoverlay_qrc.png</file>
+        <file>images/fileoverlay_qrc@2x.png</file>
+        <file>images/fileoverlay_qt.png</file>
+        <file>images/fileoverlay_qt@2x.png</file>
+        <file>images/fileoverlay_ui.png</file>
+        <file>images/fileoverlay_ui@2x.png</file>
+        <file>images/fileoverlay_scxml.png</file>
+        <file>images/fileoverlay_scxml@2x.png</file>
+        <file>images/fileoverlay_cpp.png</file>
+        <file>images/fileoverlay_cpp@2x.png</file>
+        <file>images/fileoverlay_h.png</file>
+        <file>images/fileoverlay_h@2x.png</file>
+        <file>images/fileoverlay_unknown.png</file>
+        <file>images/fileoverlay_unknown@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index cf9e10b09de..b40f7f9b91b 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -265,5 +265,15 @@ const char DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN[]="RunConfiguration.DebugRunModeWit
 // Navigation Widget
 const char PROJECTTREE_ID[] = "Projects";
 
+// File icon overlays
+const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png";
+const char FILEOVERLAY_QML[]=":/projectexplorer/images/fileoverlay_qml.png";
+const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png";
+const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png";
+const char FILEOVERLAY_CPP[]=":/projectexplorer/images/fileoverlay_cpp.png";
+const char FILEOVERLAY_H[]=":/projectexplorer/images/fileoverlay_h.png";
+const char FILEOVERLAY_SCXML[]=":/projectexplorer/images/fileoverlay_scxml.png";
+const char FILEOVERLAY_UNKNOWN[]=":/projectexplorer/images/fileoverlay_unknown.png";
+
 } // namespace Constants
 } // namespace ProjectExplorer
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index f7745f42448..dd16988bd8d 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -809,7 +809,7 @@ bool QbsProjectNode::showInSimpleTree() const
 void QbsProjectNode::ctor()
 {
     if (m_projectIcon.isNull())
-        m_projectIcon = generateIcon(QString::fromLatin1(QtSupport::Constants::ICON_QT_PROJECT));
+        m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT));
 
     setIcon(m_projectIcon);
     addFileNodes(QList<ProjectExplorer::FileNode *>()
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 2bd00069782..e31de7cec70 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -94,7 +94,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
 
     const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
 
-    Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs");
+    Core::FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QT, "qbs");
 
     //create and register objects
     addAutoReleasedObject(new QbsManager);
diff --git a/src/plugins/qmakeprojectmanager/images/headers.png b/src/plugins/qmakeprojectmanager/images/headers.png
deleted file mode 100644
index c26269004fb..00000000000
--- a/src/plugins/qmakeprojectmanager/images/headers.png
+++ /dev/null
diff --git a/src/plugins/qmakeprojectmanager/images/run_qmake.png b/src/plugins/qmakeprojectmanager/images/run_qmake.png
deleted file mode 100644
index b5aa4345c3c..00000000000
--- a/src/plugins/qmakeprojectmanager/images/run_qmake.png
+++ /dev/null
diff --git a/src/plugins/qmakeprojectmanager/images/run_qmake_small.png b/src/plugins/qmakeprojectmanager/images/run_qmake_small.png
deleted file mode 100644
index 3d732520b17..00000000000
--- a/src/plugins/qmakeprojectmanager/images/run_qmake_small.png
+++ /dev/null
diff --git a/src/plugins/qmakeprojectmanager/images/sources.png b/src/plugins/qmakeprojectmanager/images/sources.png
deleted file mode 100644
index c03a8c45f42..00000000000
--- a/src/plugins/qmakeprojectmanager/images/sources.png
+++ /dev/null
diff --git a/src/plugins/qmakeprojectmanager/images/unknown.png b/src/plugins/qmakeprojectmanager/images/unknown.png
deleted file mode 100644
index 37ebc59f8c6..00000000000
--- a/src/plugins/qmakeprojectmanager/images/unknown.png
+++ /dev/null
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 54878d3b080..81602ab6d1a 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/fileiconprovider.h>
 #include <extensionsystem/pluginmanager.h>
 #include <qtsupport/qtsupportconstants.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textdocument.h>
 #include <utils/qtcassert.h>
@@ -201,7 +202,7 @@ ProFileEditorFactory::ProFileEditorFactory()
     addHoverHandler(new ProFileHoverHandler(keywords));
     setSyntaxHighlighterCreator([keywords]() { return new ProFileHighlighter(keywords); });
 
-    const QString defaultOverlay = QLatin1String(QtSupport::Constants::ICON_QT_PROJECT);
+    const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT);
     Core::FileIconProvider::registerIconOverlayForSuffix(
                 creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay).toLatin1().data(), "pro");
     Core::FileIconProvider::registerIconOverlayForSuffix(
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 017a08c8c96..813f7c16066 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -32,6 +32,7 @@
 
 #include <projectexplorer/nodesvisitor.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/fileiconprovider.h>
@@ -94,19 +95,19 @@ struct FileTypeDataStorage {
 
 static const FileTypeDataStorage fileTypeDataStorage[] = {
     { HeaderType, Theme::ProjectExplorerHeader, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"),
-      ":/qmakeprojectmanager/images/headers.png", "*.h; *.hh; *.hpp; *.hxx;"},
+      ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"},
     { SourceType, Theme::ProjectExplorerSource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"),
-      ":/qmakeprojectmanager/images/sources.png", "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" },
+      ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" },
     { FormType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"),
-      ":/qtsupport/images/forms.png", "*.ui;" },
+      Constants::FILEOVERLAY_UI, "*.ui;" },
     { StateChartType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "State charts"),
-      ":/qtsupport/images/statecharts.png", "*.scxml;" },
+      ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" },
     { ResourceType, Theme::ProjectExplorerResource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"),
-      ":/qtsupport/images/qt_qrc.png", "*.qrc;" },
+      ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" },
     { QMLType, Theme::ProjectExplorerQML, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"),
-      ":/qtsupport/images/qml.png", "*.qml; *.qml.ui" },
+      ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" },
     { UnknownFileType, Theme::ProjectExplorerOtherFiles, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"),
-      ":/qmakeprojectmanager/images/unknown.png", "*;" }
+      ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" }
 };
 
 class SortByPath
@@ -171,7 +172,7 @@ QmakeNodeStaticData::QmakeNodeStaticData()
     }
     // Project icon
     const QString fileName = creatorTheme()->imageFile(Theme::ProjectFileIcon,
-                                                       QLatin1String(":/qtsupport/images/qt_project.png"));
+                                                       QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT));
     const QIcon projectBaseIcon(fileName);
     const QPixmap projectPixmap = FileIconProvider::overlayIcon(dirPixmap, projectBaseIcon);
     projectIcon.addPixmap(projectPixmap);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
index 43d82e38d17..5235c5ecaeb 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
@@ -70,18 +70,6 @@ QtcPlugin {
     }
 
     Group {
-        name: "Images"
-        prefix: "images/"
-        files: [
-            "headers.png",
-            "run_qmake.png",
-            "run_qmake_small.png",
-            "sources.png",
-            "unknown.png",
-        ]
-    }
-
-    Group {
         name: "Wizards"
         prefix: "wizards/"
         files: [
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc
index af8684afce3..11ce77ba611 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc
@@ -1,11 +1,6 @@
 <RCC>
     <qresource prefix="/qmakeprojectmanager">
-        <file>images/run_qmake.png</file>
-        <file>images/run_qmake_small.png</file>
         <file>QmakeProjectManager.mimetypes.xml</file>
-        <file>images/headers.png</file>
-        <file>images/sources.png</file>
-        <file>images/unknown.png</file>
         <file>images/dark_headers.png</file>
         <file>images/dark_sources.png</file>
         <file>images/dark_unknown.png</file>
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
index 354a384bd5e..27f75c9a226 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
@@ -332,6 +332,7 @@ void QMLRewriter::dump(const ASTPath &path)
 {
     qDebug() << "AST path with" << path.size() << "node(s):";
     for (int i = 0; i < path.size(); ++i) {
-        qDebug() << qPrintable(QString(i + 1, QLatin1Char('-'))) << typeid(*path.at(i)).name();
+        auto node = path.at(i);
+        qDebug().noquote() << QString(i + 1, QLatin1Char('-')) << typeid(*node).name();
     }
 }
diff --git a/src/plugins/qmljseditor/images/qmlfile.png b/src/plugins/qmljseditor/images/qmlfile.png
deleted file mode 100644
index 61ec42e3634..00000000000
--- a/src/plugins/qmljseditor/images/qmlfile.png
+++ /dev/null
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index 450feb25b1a..f5a0e42e922 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -61,8 +61,6 @@ SOURCES += \
     qmljswrapinloader.cpp \
     qmljseditordocument.cpp
 
-RESOURCES += qmljseditor.qrc
-
 FORMS += \
     quicktoolbarsettingspage.ui \
     qmljscomponentnamedialog.ui
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 139f13cba11..75a44874ba3 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -28,7 +28,6 @@ QtcPlugin {
         "qmljscomponentnamedialog.ui",
         "qmljseditor.cpp",
         "qmljseditor.h",
-        "qmljseditor.qrc",
         "qmljseditor_global.h",
         "qmljseditorconstants.h",
         "qmljseditordocument.cpp",
@@ -72,7 +71,6 @@ QtcPlugin {
         "quicktoolbarsettingspage.cpp",
         "quicktoolbarsettingspage.h",
         "quicktoolbarsettingspage.ui",
-        "images/qmlfile.png",
     ]
 
     Export {
diff --git a/src/plugins/qmljseditor/qmljseditor.qrc b/src/plugins/qmljseditor/qmljseditor.qrc
deleted file mode 100644
index 35ecba5f6ee..00000000000
--- a/src/plugins/qmljseditor/qmljseditor.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/qmljseditor">
-        <file>images/qmlfile.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index c8dd189dc65..adb409377b2 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -50,6 +50,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/taskhub.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/json.h>
@@ -186,7 +187,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 
     errorMessage->clear();
 
-    FileIconProvider::registerIconOverlayForSuffix(":/qmljseditor/images/qmlfile.png", "qml");
+    FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QML, "qml");
 
     registerQuickFixes(this);
 
diff --git a/src/plugins/qtsupport/images/forms.png b/src/plugins/qtsupport/images/forms.png
deleted file mode 100644
index 72d1549b58a..00000000000
--- a/src/plugins/qtsupport/images/forms.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/qml.png b/src/plugins/qtsupport/images/qml.png
deleted file mode 100644
index 1478cf94550..00000000000
--- a/src/plugins/qtsupport/images/qml.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/qt_project.png b/src/plugins/qtsupport/images/qt_project.png
deleted file mode 100644
index d067c8a0516..00000000000
--- a/src/plugins/qtsupport/images/qt_project.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/qt_qrc.png b/src/plugins/qtsupport/images/qt_qrc.png
deleted file mode 100644
index 961e3e1a4ee..00000000000
--- a/src/plugins/qtsupport/images/qt_qrc.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/statecharts.png b/src/plugins/qtsupport/images/statecharts.png
deleted file mode 100644
index c8a418f4de2..00000000000
--- a/src/plugins/qtsupport/images/statecharts.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 361f66ec3ea..29e096fd89a 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -102,11 +102,6 @@ QtcPlugin {
         "showbuildlog.ui",
         "uicgenerator.cpp",
         "uicgenerator.h",
-        "images/forms.png",
-        "images/qml.png",
-        "images/qt_project.png",
-        "images/qt_qrc.png",
-        "images/statecharts.png",
     ]
 
     Group {
diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc
index dfd1666b59f..597f3a0982b 100644
--- a/src/plugins/qtsupport/qtsupport.qrc
+++ b/src/plugins/qtsupport/qtsupport.qrc
@@ -1,10 +1,5 @@
 <RCC>
     <qresource prefix="/qtsupport">
-        <file>images/forms.png</file>
-        <file>images/statecharts.png</file>
-        <file>images/qml.png</file>
-        <file>images/qt_project.png</file>
-        <file>images/qt_qrc.png</file>
         <file>images/dark_forms.png</file>
         <file>images/dark_qml.png</file>
         <file>images/dark_qt_project.png</file>
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index e9c0c610054..e2c90d9803a 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -58,8 +58,5 @@ const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
 const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile";
 const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop";
 
-// Icon:
-const char ICON_QT_PROJECT[] = ":/qtsupport/images/qt_project.png";
-
 } // namepsace Constants
 } // namepsace QtSupport
diff --git a/src/plugins/resourceeditor/images/qt_qrc.png b/src/plugins/resourceeditor/images/qt_qrc.png
deleted file mode 100644
index 2b0fea75030..00000000000
--- a/src/plugins/resourceeditor/images/qt_qrc.png
+++ /dev/null
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index ef15fe66604..d034a0556c0 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -30,6 +30,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/removefiledialog.h>
 #include <coreplugin/vcsmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fileutils.h>
 
 #include <QCoreApplication>
@@ -547,7 +548,7 @@ ResourceModel::ResourceModel(QObject *parent)
     : QAbstractItemModel(parent), m_dirty(false)
 {
     m_prefixIcon = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
-        QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QSize(16, 16));
+        QIcon(QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QRC)), QSize(16, 16));
 }
 
 void ResourceModel::setDirty(bool b)
diff --git a/src/plugins/resourceeditor/resourceeditor.qrc b/src/plugins/resourceeditor/resourceeditor.qrc
index 2a1816f1cba..9d6b792e035 100644
--- a/src/plugins/resourceeditor/resourceeditor.qrc
+++ b/src/plugins/resourceeditor/resourceeditor.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/resourceeditor">
-        <file>images/qt_qrc.png</file>
         <file>ResourceEditor.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index de7c80d82e9..d4707e3f694 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -30,6 +30,7 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QCoreApplication>
 #include <QFileInfo>
@@ -46,7 +47,8 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) :
     setMimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE)));
     setDisplayName(qApp->translate("OpenWith::Editors", C_RESOURCEEDITOR_DISPLAY_NAME));
 
-    Core::FileIconProvider::registerIconOverlayForSuffix(":/resourceeditor/images/qt_qrc.png", "qrc");
+    Core::FileIconProvider::registerIconOverlayForSuffix(
+                ProjectExplorer::Constants::FILEOVERLAY_QRC, "qrc");
 }
 
 Core::IEditor *ResourceEditorFactory::createEditor()
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index a8c7ea64b99..d17bcfe5b2f 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -33,6 +33,7 @@
 #include <coreplugin/settingsdatabase.h>
 #include <coreplugin/shellcommand.h>
 #include <utils/fileutils.h>
+#include <utils/synchronousprocess.h>
 
 #include <QDate>
 #include <QDomDocument>
@@ -60,6 +61,13 @@ using namespace Core;
 namespace UpdateInfo {
 namespace Internal {
 
+class IgnoreExitCode : public Utils::ExitCodeInterpreter
+{
+public:
+    IgnoreExitCode(QObject *parent);
+    Utils::SynchronousProcessResponse::Result interpretExitCode(int code) const override;
+};
+
 class UpdateInfoPluginPrivate
 {
 public:
@@ -76,6 +84,16 @@ public:
     QDate m_lastCheckDate;
 };
 
+IgnoreExitCode::IgnoreExitCode(QObject *parent)
+    : Utils::ExitCodeInterpreter(parent)
+{
+}
+
+Utils::SynchronousProcessResponse::Result IgnoreExitCode::interpretExitCode(int code) const
+{
+    Q_UNUSED(code)
+    return Utils::SynchronousProcessResponse::Finished;
+}
 
 UpdateInfoPlugin::UpdateInfoPlugin()
     : d(new UpdateInfoPluginPrivate)
@@ -123,10 +141,13 @@ void UpdateInfoPlugin::startCheckForUpdates()
 {
     stopCheckForUpdates();
 
-    d->m_checkUpdatesCommand = new ShellCommand(QString(), QProcessEnvironment());
+    QProcessEnvironment env;
+    env.insert(QLatin1String("QT_LOGGING_RULES"), QLatin1String("*=false"));
+    d->m_checkUpdatesCommand = new ShellCommand(QString(), env);
     connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput);
     connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished);
-    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")));
+    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")),
+                                     /*workingDirectory=*/QString(), new IgnoreExitCode(d->m_checkUpdatesCommand));
     d->m_checkUpdatesCommand->execute();
     emit checkForUpdatesRunningChanged(true);
 }