Move "Ok", "Error" and "Notloaded" icons from ExtentionSystem to Utils

These icons are useful in other situations (e.g. QmlDesigner)

Change-Id: I31751b8ca8fea34c532d54d423e5fef07b370a4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>

10 files changed, 4 insertions, 28 deletions

diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index ec147aec939..dce2b19b17d 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -37,7 +37,3 @@ FORMS += \
     pluginerrorview.ui \
     plugindetailsview.ui \
     pluginerroroverview.ui
-RESOURCES += pluginview.qrc
-
-
-
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 003c591e7b9..62c5b26ed55 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/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 {
diff --git a/src/libs/extensionsystem/images/error.png b/src/libs/extensionsystem/images/error.png
deleted file mode 100644
index 3afb9548f6d..00000000000
--- a/src/libs/extensionsystem/images/error.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/images/error@2x.png b/src/libs/extensionsystem/images/error@2x.png
deleted file mode 100644
index af6c94483e8..00000000000
--- a/src/libs/extensionsystem/images/error@2x.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/images/notloaded.png b/src/libs/extensionsystem/images/notloaded.png
deleted file mode 100644
index 16de272cae9..00000000000
--- a/src/libs/extensionsystem/images/notloaded.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/images/notloaded@2x.png b/src/libs/extensionsystem/images/notloaded@2x.png
deleted file mode 100644
index 902bf624cd9..00000000000
--- a/src/libs/extensionsystem/images/notloaded@2x.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/images/ok.png b/src/libs/extensionsystem/images/ok.png
deleted file mode 100644
index 13d8dfaae2f..00000000000
--- a/src/libs/extensionsystem/images/ok.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/images/ok@2x.png b/src/libs/extensionsystem/images/ok@2x.png
deleted file mode 100644
index 7dc3295fedd..00000000000
--- a/src/libs/extensionsystem/images/ok@2x.png
+++ /dev/null
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index 2dea6e1b251..6911475b53e 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/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;
     }
     }
diff --git a/src/libs/extensionsystem/pluginview.qrc b/src/libs/extensionsystem/pluginview.qrc
deleted file mode 100644
index da218976eb7..00000000000
--- a/src/libs/extensionsystem/pluginview.qrc
+++ /dev/null
@@ -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>