From e2dab0cf07a99aa969be574753a017ca4c87c0f8 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Fri, 1 Jul 2016 16:53:19 +0200
Subject: [PATCH] QmlDesigner: Replace custom +/- button icons in
 connectioneditor

Use the themable ones from Core::Icons instead

Change-Id: I45e831e9b0586bfde6468acca07b6138b48f82e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
---
 .../connectioneditor/connectioneditor.qrc         |   2 --
 .../connectioneditor/connectionviewwidget.cpp     |   5 +++--
 .../connectioneditor/minus.png                    | Bin 189 -> 0 bytes
 .../connectioneditor/plus.png                     | Bin 197 -> 0 bytes
 src/plugins/qmldesigner/qmldesignerplugin.qbs     |   2 --
 5 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/plugins/qmldesigner/qmldesignerextension/connectioneditor/minus.png
 delete mode 100644 src/plugins/qmldesigner/qmldesignerextension/connectioneditor/plus.png

diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectioneditor.qrc b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectioneditor.qrc
index 0a5e51b1652..a313b6648d6 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectioneditor.qrc
+++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectioneditor.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/connectionview">
         <file>stylesheet.css</file>
-        <file>plus.png</file>
-        <file>minus.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp
index 09c85931eed..f20f4139125 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp
@@ -33,6 +33,7 @@
 #include "dynamicpropertiesmodel.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/coreicons.h>
 #include <utils/fileutils.h>
 
 #include <QToolButton>
@@ -118,13 +119,13 @@ QList<QToolButton *> ConnectionViewWidget::createToolBarWidgets()
     QList<QToolButton *> buttons;
 
     buttons << new QToolButton();
-    buttons.last()->setIcon(QIcon(QStringLiteral(":/connectionview/plus.png")));
+    buttons.last()->setIcon(Core::Icons::PLUS.icon());
     buttons.last()->setToolTip(tr("Add binding or connection."));
     connect(buttons.last(), SIGNAL(clicked()), this, SLOT(addButtonClicked()));
     connect(this, SIGNAL(setEnabledAddButton(bool)), buttons.last(), SLOT(setEnabled(bool)));
 
     buttons << new QToolButton();
-    buttons.last()->setIcon(QIcon(QStringLiteral(":/connectionview/minus.png")));
+    buttons.last()->setIcon(Core::Icons::MINUS.icon());
     buttons.last()->setToolTip(tr("Remove selected binding or connection."));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Delete));
     connect(buttons.last(), SIGNAL(clicked()), this, SLOT(removeButtonClicked()));
diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/minus.png b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/minus.png
deleted file mode 100644
index 016ee52b211bab4d91872ee61003b2bf3acc8ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzn2Vh}LpV4%Za?&Yz`(%3
zS>O>_%)r2V9fTR3G-g*YFfd4#xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk
z1=1Pd6XN>+|9=JshTFGq_c)}mFfcGMl?3?(GZ>$AUZcmrz#!r2;uyklJvl*vXGhrD
kC<es{XJ_UQt63TL-evi7JJYw4fq{X+)78&qol`;+0JqjQEC2ui

diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/plus.png b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/plus.png
deleted file mode 100644
index d16329ca450e216810f5ec913054acbd22f88e2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzn2Vh}LpV4%Za?&Yz`(%3
zS>O>_%)r2V9fTR3G-g*YFfd4#xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk
z1=1Pd6XN>+|9=JshTFGq_c)}mFfcGMl?3?(GZ>$AUZcmrz@Xsi;uyklJvqUFVHw*S
qmg}oRxfNKlZ(Lz`^GZTiA&r5d!In#a>EI%eS_V&7KbLh*2~7ZRZ8x9*

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
index 5d5c11330bd..985112938f2 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.qbs
+++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -583,8 +583,6 @@ Project {
                 "connectioneditor/connectionviewwidget.ui",
                 "connectioneditor/dynamicpropertiesmodel.cpp",
                 "connectioneditor/dynamicpropertiesmodel.h",
-                "connectioneditor/minus.png",
-                "connectioneditor/plus.png",
                 "connectioneditor/stylesheet.css",
                 "pathtool/controlpoint.cpp",
                 "pathtool/controlpoint.h",