From 0ecd5436148edc2c8f0ffb12a4acb633c525046c Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 21 Mar 2018 22:26:12 +0100
Subject: [PATCH] AutoTest: Use a prefix in autotest.qrc

Since all resources in Qt Creator get merged together at runtime, they
should be prefixed with the library/plugin name.

Change-Id: Ie411388ed72f099647b25787a140feff1828d3f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/autotest/autotest.qrc         |  2 +-
 src/plugins/autotest/autotesticons.h      | 14 +++++++-------
 src/plugins/autotest/testsettingspage.cpp |  2 +-
 src/plugins/autotest/testtreeitem.cpp     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc
index 554a14344e1..580958b1f6e 100644
--- a/src/plugins/autotest/autotest.qrc
+++ b/src/plugins/autotest/autotest.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/autotest">
         <file>images/autotest.png</file>
         <file>images/sort.png</file>
         <file>images/sort@2x.png</file>
diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h
index 632fc375e16..07a8f86875a 100644
--- a/src/plugins/autotest/autotesticons.h
+++ b/src/plugins/autotest/autotesticons.h
@@ -31,12 +31,12 @@ namespace Autotest {
 namespace Icons {
 
 const Utils::Icon SORT_ALPHABETICALLY({
-        {":/images/sort.png", Utils::Theme::IconsBaseColor}});
+        {":/autotest/images/sort.png", Utils::Theme::IconsBaseColor}});
 const Utils::Icon SORT_NATURALLY({
-        {":/images/leafsort.png", Utils::Theme::IconsBaseColor}});
+        {":/autotest/images/leafsort.png", Utils::Theme::IconsBaseColor}});
 const Utils::Icon RUN_SELECTED_OVERLAY({
-        {":/images/runselected_boxes.png", Utils::Theme::BackgroundColorDark},
-        {":/images/runselected_tickmarks.png", Utils::Theme::IconsBaseColor}});
+        {":/autotest/images/runselected_boxes.png", Utils::Theme::BackgroundColorDark},
+        {":/autotest/images/runselected_tickmarks.png", Utils::Theme::IconsBaseColor}});
 
 const Utils::Icon RESULT_PASS({
         {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestPassTextColor}},
@@ -63,7 +63,7 @@ const Utils::Icon RESULT_BLACKLISTEDFAIL({
         Utils::Icon::Tint | Utils::Icon::PunchEdges);
 const Utils::Icon RESULT_BENCHMARK({
         {":/utils/images/filledcircle.png", Utils::Theme::BackgroundColorNormal},
-        {":/images/benchmark.png", Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
+        {":/autotest/images/benchmark.png", Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
 const Utils::Icon RESULT_MESSAGEDEBUG({
         {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestDebugTextColor}},
         Utils::Icon::Tint);
@@ -81,8 +81,8 @@ const Utils::Icon RESULT_MESSAGEFAILWARN({
 const Utils::Icon RESULT_MESSAGEFATAL({
         {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFatalTextColor}},
         Utils::Icon::Tint);
-const Utils::Icon VISUAL_DISPLAY({{":/images/visual.png", Utils::Theme::IconsBaseColor}});
-const Utils::Icon TEXT_DISPLAY({{":/images/text.png", Utils::Theme::IconsBaseColor}});
+const Utils::Icon VISUAL_DISPLAY({{":/autotest/images/visual.png", Utils::Theme::IconsBaseColor}});
+const Utils::Icon TEXT_DISPLAY({{":/autotest/images/text.png", Utils::Theme::IconsBaseColor}});
 
 } // namespace Icons
 } // namespace Autotest
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index f0fc60c09fc..c054f612104 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -279,7 +279,7 @@ TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings)
     setDisplayName(tr("General"));
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("AutoTest", Constants::AUTOTEST_SETTINGS_TR));
-    setCategoryIcon(Utils::Icon(":/images/autotest.png"));
+    setCategoryIcon(Utils::Icon(":/autotest/images/autotest.png"));
 }
 
 TestSettingsPage::~TestSettingsPage()
diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp
index a308ee628ce..d415feaa723 100644
--- a/src/plugins/autotest/testtreeitem.cpp
+++ b/src/plugins/autotest/testtreeitem.cpp
@@ -64,7 +64,7 @@ static QIcon testTreeIcon(TestTreeItem::Type type)
         Utils::Icons::OPENFILE.icon(),
         CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType),
         CPlusPlus::Icons::iconForType(CPlusPlus::Icons::SlotPrivateIconType),
-        QIcon(":/images/data.png")
+        QIcon(":/autotest/images/data.png")
     };
 
     if (int(type) >= int(sizeof icons / sizeof *icons))