Moving desktopdevicesmall.png from projectexplorer to core

It is also needed by imageviewer

Change-Id: Idd489ebc71768e293790e4b8f8ae9f5ede38e80d
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

10 files changed, 7 insertions, 9 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 171fa48839..6d8c5faa58 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -115,5 +115,7 @@
         <file>images/eye_closed@2x.png</file>
         <file>images/eye_open.png</file>
         <file>images/eye_open@2x.png</file>
+        <file>images/desktopdevicesmall.png</file>
+        <file>images/desktopdevicesmall@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/images/desktopdevicesmall.png b/src/plugins/coreplugin/images/desktopdevicesmall.png
index adc2b78bce..adc2b78bce 100644
--- a/src/plugins/projectexplorer/images/desktopdevicesmall.png
+++ b/src/plugins/coreplugin/images/desktopdevicesmall.png
diff --git a/src/plugins/projectexplorer/images/desktopdevicesmall@2x.png b/src/plugins/coreplugin/images/desktopdevicesmall@2x.png
index 2323f95b6f..2323f95b6f 100644
--- a/src/plugins/projectexplorer/images/desktopdevicesmall@2x.png
+++ b/src/plugins/coreplugin/images/desktopdevicesmall@2x.png
diff --git a/src/plugins/imageviewer/images/background.png b/src/plugins/imageviewer/images/background.png
deleted file mode 100644
index 93a092ab13..0000000000
--- a/src/plugins/imageviewer/images/background.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index ed47e06c43..4122794176 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -102,6 +102,9 @@ void ImageViewer::ctor()
     d->ui_toolbar.setupUi(d->toolbar);
     d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
                                                                   Core::Icons::SAVEFILE.icon()));
+    const Utils::Icon backgroundIcon({
+            {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}});
+    d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
     d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon());
     d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
     d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index 23266219fd..c62bf29a21 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/imageviewer">
-        <file>images/background.png</file>
         <file>ImageViewer.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui
index 0ca8fe689a..0a230946d3 100644
--- a/src/plugins/imageviewer/imageviewertoolbar.ui
+++ b/src/plugins/imageviewer/imageviewertoolbar.ui
@@ -29,10 +29,6 @@
      <property name="toolTipBase">
       <string>Show Background</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/background.png</normaloff>:/imageviewer/images/background.png</iconset>
-     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 6d9310c46f..15513cd564 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -69,7 +69,5 @@
         <file>images/targetchangebutton2@2x.png</file>
         <file>images/desktopdevice.png</file>
         <file>images/desktopdevice@2x.png</file>
-        <file>images/desktopdevicesmall.png</file>
-        <file>images/desktopdevicesmall@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h
index 384be59100..55c8baffb6 100644
--- a/src/plugins/projectexplorer/projectexplorericons.h
+++ b/src/plugins/projectexplorer/projectexplorericons.h
@@ -70,7 +70,7 @@ const Utils::Icon BUILDSTEP_REMOVE({
 const Utils::Icon DESKTOP_DEVICE({
         {QLatin1String(":/projectexplorer/images/desktopdevice.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon DESKTOP_DEVICE_SMALL({
-        {QLatin1String(":/projectexplorer/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
+        {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
 
 const Utils::Icon MODE_PROJECT_CLASSIC(
         QLatin1String(":/projectexplorer/images/mode_project.png"));
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e0059d54ee..e6e9207075 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -5025,7 +5025,7 @@
        x="0"
        y="0"
        xlink:href="#src/plugins/projectexplorer/images/desktopdevice"
-       id="src/plugins/projectexplorer/images/desktopdevicesmall"
+       id="src/plugins/coreplugin/images/desktopdevicesmall"
        transform="matrix(0.5,0,0,0.5,285,189.5)"
        width="100%"
        height="100%" />