Merge remote-tracking branch 'origin/4.1'

Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f

src/libs/extensionsystem/extensionsystem.pro

@@ -37,7 +37,3 @@ FORMS += \
     pluginerrorview.ui \
     plugindetailsview.ui \
     pluginerroroverview.ui
-RESOURCES += pluginview.qrc
-
-
-

src/libs/extensionsystem/extensionsystem.qbs

@@ -43,10 +43,6 @@ Project {
             "pluginspec_p.h",
             "pluginview.cpp",
             "pluginview.h",
-            "pluginview.qrc",
-            "images/error.png",
-            "images/notloaded.png",
-            "images/ok.png",
         ]
 
         Export {

src/libs/extensionsystem/pluginmanager.cpp

@@ -1024,6 +1024,8 @@ static int executeTestPlan(const TestPlan &testPlan)
                 << QLatin1String("arg0") // fake application name
                 << QLatin1String("-maxwarnings") << QLatin1String("0"); // unlimit output
         qExecArguments << functions;
+        // avoid being stuck in QTBUG-24925
+        qExecArguments << "-nocrashhandler";
         failedTests += QTest::qExec(testObject, qExecArguments);
     }
 

src/libs/extensionsystem/pluginview.cpp

@@ -31,7 +31,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/categorysortfiltermodel.h>
-#include <utils/icon.h>
+#include <utils/utilsicons.h>
 #include <utils/itemviews.h>
 #include <utils/qtcassert.h>
 #include <utils/treemodel.h>
@@ -90,22 +90,16 @@ static const QIcon &icon(IconIndex icon)
     using namespace Utils;
     switch (icon) {
     case OkIcon: {
-        static const QIcon ok =
-                Icon({{QLatin1String(":/extensionsystem/images/ok.png"),
-                       Theme::IconsRunToolBarColor}}, Icon::Tint).icon();
+        static const QIcon ok = Utils::Icons::OK.icon();
         return ok;
     }
     case ErrorIcon: {
-        static const QIcon error =
-                Icon({{QLatin1String(":/extensionsystem/images/error.png"),
-                       Theme::IconsErrorColor}}, Icon::Tint).icon();
+        static const QIcon error = Utils::Icons::ERROR.icon();
         return error;
     }
     default:
     case NotLoadedIcon: {
-        static const QIcon notLoaded =
-                Icon({{QLatin1String(":/extensionsystem/images/notloaded.png"),
-                       Theme::IconsErrorColor}}, Icon::Tint).icon();
+        static const QIcon notLoaded = Utils::Icons::NOTLOADED.icon();
         return notLoaded;
     }
     }

src/libs/extensionsystem/pluginview.qrc

@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/extensionsystem">
-        <file>images/ok.png</file>
-        <file>images/ok@2x.png</file>
-        <file>images/error.png</file>
-        <file>images/error@2x.png</file>
-        <file>images/notloaded.png</file>
-        <file>images/notloaded@2x.png</file>
-    </qresource>
-</RCC>