Bounding Rect Icon: Move from qmldesigner to core

..and re-use it in the imageviewer plugin

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

13 files changed, 9 insertions, 11 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a6a223c023..a4fa04d2c0 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -109,5 +109,7 @@
         <file>images/run_small@2x.png</file>
         <file>images/stop_small.png</file>
         <file>images/stop_small@2x.png</file>
+        <file>images/boundingrect.png</file>
+        <file>images/boundingrect@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index 9fa70f9ac3..1980a7779a 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -146,6 +146,8 @@ const Utils::Icon STOP_SMALL({
         {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}});
 const Utils::Icon INTERRUPT_SMALL({
         {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}});
+const Icon BOUNDING_RECT({
+        {QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}});
 
 const Icon MODE_EDIT_CLASSIC(
         QLatin1String(":/fancyactionbar/images/mode_Edit.png"));
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index 1a9a57ed1a..4b6e24f8a4 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -90,6 +90,7 @@ CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION;
 CORE_EXPORT extern const Utils::Icon RUN_SMALL;
 CORE_EXPORT extern const Utils::Icon STOP_SMALL;
 CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL;
+CORE_EXPORT extern const Utils::Icon BOUNDING_RECT;
 
 CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC;
 CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT;
diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect.png b/src/plugins/coreplugin/images/boundingrect.png
index 0a91478d6d..0a91478d6d 100644
--- a/src/plugins/qmldesigner/components/formeditor/boundingrect.png
+++ b/src/plugins/coreplugin/images/boundingrect.png
diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png b/src/plugins/coreplugin/images/boundingrect@2x.png
index 43ea7993fb..43ea7993fb 100644
--- a/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png
+++ b/src/plugins/coreplugin/images/boundingrect@2x.png
diff --git a/src/plugins/imageviewer/images/outline.png b/src/plugins/imageviewer/images/outline.png
deleted file mode 100644
index aaa9464535..0000000000
--- a/src/plugins/imageviewer/images/outline.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index a3809b3519..5710174a1d 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -102,6 +102,7 @@ void ImageViewer::ctor()
     d->ui_toolbar.setupUi(d->toolbar);
     d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
                                                                   Core::Icons::SAVEFILE.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());
     d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index 9adc10e090..60678a9ced 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/imageviewer">
-        <file>images/outline.png</file>
         <file>images/originalsize.png</file>
         <file>images/background.png</file>
         <file>ImageViewer.mimetypes.xml</file>
diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui
index 0c86a3e585..4dec6dc66e 100644
--- a/src/plugins/imageviewer/imageviewertoolbar.ui
+++ b/src/plugins/imageviewer/imageviewertoolbar.ui
@@ -46,10 +46,6 @@
      <property name="toolTipBase">
       <string>Show Outline</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/outline.png</normaloff>:/imageviewer/images/outline.png</iconset>
-     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditor.qrc b/src/plugins/qmldesigner/components/formeditor/formeditor.qrc
index 4b949ad92c..6f986b3a1e 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditor.qrc
+++ b/src/plugins/qmldesigner/components/formeditor/formeditor.qrc
@@ -6,8 +6,6 @@
         <file>no_snapping@2x.png</file>
         <file>snapping_and_anchoring.png</file>
         <file>snapping_and_anchoring@2x.png</file>
-        <file>boundingrect.png</file>
-        <file>boundingrect@2x.png</file>
     </qresource>
     <qresource prefix="/icon">
         <file>reset.png</file>
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 8ca2afd850..936c299b84 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -40,6 +40,7 @@
 #include <lineeditaction.h>
 #include <backgroundaction.h>
 
+#include <coreplugin/coreicons.h>
 #include <utils/fileutils.h>
 
 namespace QmlDesigner {
@@ -97,7 +98,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     m_showBoundingRectAction->setCheckable(true);
     m_showBoundingRectAction->setChecked(true);
-    m_showBoundingRectAction->setIcon(Icons::BOUNDING_RECT.icon());
+    m_showBoundingRectAction->setIcon(Core::Icons::BOUNDING_RECT.icon());
 
     addAction(m_showBoundingRectAction.data());
     upperActions.append(m_showBoundingRectAction.data());
diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h
index 3fb9732c68..c85c2a7692 100644
--- a/src/plugins/qmldesigner/qmldesignericons.h
+++ b/src/plugins/qmldesigner/qmldesignericons.h
@@ -47,8 +47,6 @@ const Utils::Icon EXPORT_CHECKED({
         {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon EXPORT_UNCHECKED({
         {QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon BOUNDING_RECT({
-        {QLatin1String(":/icon/layout/boundingrect.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon SNAPPING({
         {QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon NO_SNAPPING({
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e2d680e5c6..1435147586 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -2596,7 +2596,7 @@
     <g
        transform="translate(608,268)"
        style="display:inline"
-       id="src/plugins/qmldesigner/components/formeditor/boundingrect">
+       id="src/plugins/coreplugin/images/boundingrect">
       <rect
          id="rect6754-2"
          height="16"