From 2aa315d05c5fdff88490dabf291b32989dd9c7f9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 16 Feb 2015 15:34:28 +0100 Subject: 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 --- src/libs/qmleditorwidgets/images/eye_crossed.png | Bin 731 -> 0 bytes src/libs/qmleditorwidgets/resources.qrc | 1 - src/plugins/valgrind/images/eye_crossed.png | Bin 0 -> 731 bytes src/plugins/valgrind/memcheckerrorview.cpp | 2 +- src/plugins/valgrind/valgrind.pro | 2 ++ src/plugins/valgrind/valgrind.qrc | 5 +++++ 6 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 src/libs/qmleditorwidgets/images/eye_crossed.png create mode 100644 src/plugins/valgrind/images/eye_crossed.png create mode 100644 src/plugins/valgrind/valgrind.qrc diff --git a/src/libs/qmleditorwidgets/images/eye_crossed.png b/src/libs/qmleditorwidgets/images/eye_crossed.png deleted file mode 100644 index 8c7ede732b..0000000000 Binary files a/src/libs/qmleditorwidgets/images/eye_crossed.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 16575214fc..2a03bc7cd5 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -13,7 +13,6 @@ images/checkbox_tr_unchecked_hover.png images/checkbox_tr_unchecked_pressed.png images/eye_open.png - images/eye_crossed.png images/lock.png images/hole.png images/down_arrow.png diff --git a/src/plugins/valgrind/images/eye_crossed.png b/src/plugins/valgrind/images/eye_crossed.png new file mode 100644 index 0000000000..8c7ede732b Binary files /dev/null and b/src/plugins/valgrind/images/eye_crossed.png differ diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 5294553707..153b1ff72d 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 188ac67ec7..b8d831d27a 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 0000000000..f612c22f2e --- /dev/null +++ b/src/plugins/valgrind/valgrind.qrc @@ -0,0 +1,5 @@ + + + images/eye_crossed.png + + -- cgit v1.2.1