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/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 #include -#include +#include #include #include #include @@ -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 @@ - - - images/ok.png - images/ok@2x.png - images/error.png - images/error@2x.png - images/notloaded.png - images/notloaded@2x.png - - diff --git a/src/libs/extensionsystem/images/error.png b/src/libs/utils/images/error.png similarity index 100% rename from src/libs/extensionsystem/images/error.png rename to src/libs/utils/images/error.png diff --git a/src/libs/extensionsystem/images/error@2x.png b/src/libs/utils/images/error@2x.png similarity index 100% rename from src/libs/extensionsystem/images/error@2x.png rename to src/libs/utils/images/error@2x.png diff --git a/src/libs/extensionsystem/images/notloaded.png b/src/libs/utils/images/notloaded.png similarity index 100% rename from src/libs/extensionsystem/images/notloaded.png rename to src/libs/utils/images/notloaded.png diff --git a/src/libs/extensionsystem/images/notloaded@2x.png b/src/libs/utils/images/notloaded@2x.png similarity index 100% rename from src/libs/extensionsystem/images/notloaded@2x.png rename to src/libs/utils/images/notloaded@2x.png diff --git a/src/libs/extensionsystem/images/ok.png b/src/libs/utils/images/ok.png similarity index 100% rename from src/libs/extensionsystem/images/ok.png rename to src/libs/utils/images/ok.png diff --git a/src/libs/extensionsystem/images/ok@2x.png b/src/libs/utils/images/ok@2x.png similarity index 100% rename from src/libs/extensionsystem/images/ok@2x.png rename to src/libs/utils/images/ok@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 035389c93b1..604fda2a064 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -25,5 +25,11 @@ images/locked@2x.png images/unlocked.png images/unlocked@2x.png + images/error.png + images/error@2x.png + images/notloaded.png + images/notloaded@2x.png + images/ok.png + images/ok@2x.png diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 601907c2b0b..aa74759f9c8 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -50,6 +50,12 @@ const Utils::Icon ZOOM({ {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); const Utils::Icon ZOOM_TOOLBAR({ {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon OK({ + {QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint); +const Utils::Icon NOTLOADED({ + {QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); +const Utils::Icon ERROR({ + {QLatin1String(":/utils/images/error.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); } // namespace Icons } // namespace Utils diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index b39d8ed2490..a757070432a 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1358,7 +1358,7 @@ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="src/libs/utils/images/ok">