From 2aa315d05c5fdff88490dabf291b32989dd9c7f9 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Mon, 16 Feb 2015 15:34:28 +0100
Subject: [PATCH] Qt Quick Designer: Move valgrind icon to valgrind plugin

The "eye_crossed" icon is defined in one place and used in a
totally different up.

Change-Id: I392b5c1b8cf80803d0416ae272ded369f06ca405
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 src/libs/qmleditorwidgets/resources.qrc             |   1 -
 .../valgrind}/images/eye_crossed.png                | Bin
 src/plugins/valgrind/memcheckerrorview.cpp          |   2 +-
 src/plugins/valgrind/valgrind.pro                   |   2 ++
 src/plugins/valgrind/valgrind.qrc                   |   5 +++++
 5 files changed, 8 insertions(+), 2 deletions(-)
 rename src/{libs/qmleditorwidgets => plugins/valgrind}/images/eye_crossed.png (100%)
 create mode 100644 src/plugins/valgrind/valgrind.qrc

diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc
index 16575214fc0..2a03bc7cd56 100644
--- a/src/libs/qmleditorwidgets/resources.qrc
+++ b/src/libs/qmleditorwidgets/resources.qrc
@@ -13,7 +13,6 @@
         <file>images/checkbox_tr_unchecked_hover.png</file>
         <file>images/checkbox_tr_unchecked_pressed.png</file>
         <file>images/eye_open.png</file>
-        <file>images/eye_crossed.png</file>
         <file>images/lock.png</file>
         <file>images/hole.png</file>
         <file>images/down_arrow.png</file>
diff --git a/src/libs/qmleditorwidgets/images/eye_crossed.png b/src/plugins/valgrind/images/eye_crossed.png
similarity index 100%
rename from src/libs/qmleditorwidgets/images/eye_crossed.png
rename to src/plugins/valgrind/images/eye_crossed.png
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index 52945537078..153b1ff72d7 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -288,7 +288,7 @@ MemcheckErrorView::MemcheckErrorView(QWidget *parent)
 
     m_suppressAction = new QAction(this);
     m_suppressAction->setText(tr("Suppress Error"));
-    m_suppressAction->setIcon(QIcon(QLatin1String(":/qmldesigner/images/eye_crossed.png")));
+    m_suppressAction->setIcon(QIcon(QLatin1String(":/valgrind/images/eye_crossed.png")));
     m_suppressAction->setShortcut(QKeySequence(Qt::Key_Delete));
     m_suppressAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     connect(m_suppressAction, &QAction::triggered, this, &MemcheckErrorView::suppressError);
diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro
index 188ac67ec74..b8d831d27aa 100644
--- a/src/plugins/valgrind/valgrind.pro
+++ b/src/plugins/valgrind/valgrind.pro
@@ -55,3 +55,5 @@ SOURCES += \
 FORMS += \
     valgrindconfigwidget.ui
 
+RESOURCES += \
+    valgrind.qrc
diff --git a/src/plugins/valgrind/valgrind.qrc b/src/plugins/valgrind/valgrind.qrc
new file mode 100644
index 00000000000..f612c22f2e6
--- /dev/null
+++ b/src/plugins/valgrind/valgrind.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/valgrind">
+        <file>images/eye_crossed.png</file>
+    </qresource>
+</RCC>