From 503bd4019978842fa3a6782b788c311fa7acc63f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 2 Jun 2014 14:56:07 +0200 Subject: [PATCH] CPaster: Move setting category icon from Core to CPaster This image is used exclusively in the CPaster plugin, thus belong into CPaster resources. Change-Id: If2718c7a58bca389c0afe7ecf32feb251eb0c581 Reviewed-by: Tobias Hunger --- src/plugins/coreplugin/core.qrc | 1 - src/plugins/cpaster/cpaster.pro | 3 +++ src/plugins/cpaster/cpaster.qbs | 1 + src/plugins/cpaster/cpaster.qrc | 5 +++++ src/plugins/cpaster/cpasterconstants.h | 2 +- .../images/category_cpaster.png | Bin 6 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/plugins/cpaster/cpaster.qrc rename src/plugins/{coreplugin => cpaster}/images/category_cpaster.png (100%) diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index bb606f02a32..4523a86f839 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -72,7 +72,6 @@ images/arrowup.png images/arrowup@2x.png images/category_locator.png - images/category_cpaster.png images/filtericon.png images/filtericon@2x.png images/button_close.png diff --git a/src/plugins/cpaster/cpaster.pro b/src/plugins/cpaster/cpaster.pro index f697c94e166..5bdc8e25455 100644 --- a/src/plugins/cpaster/cpaster.pro +++ b/src/plugins/cpaster/cpaster.pro @@ -35,3 +35,6 @@ FORMS += settingspage.ui \ pastebindotcomsettings.ui \ fileshareprotocolsettingswidget.ui include(../../shared/cpaster/cpaster.pri) + +RESOURCES += \ + cpaster.qrc diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs index 433153b007b..69eeace2eb2 100644 --- a/src/plugins/cpaster/cpaster.qbs +++ b/src/plugins/cpaster/cpaster.qbs @@ -17,6 +17,7 @@ QtcPlugin { "columnindicatortextedit.cpp", "columnindicatortextedit.h", "cpasterconstants.h", + "cpaster.qrc", "cpasterplugin.cpp", "cpasterplugin.h", "fileshareprotocol.cpp", diff --git a/src/plugins/cpaster/cpaster.qrc b/src/plugins/cpaster/cpaster.qrc new file mode 100644 index 00000000000..f73d6bb204d --- /dev/null +++ b/src/plugins/cpaster/cpaster.qrc @@ -0,0 +1,5 @@ + + + images/category_cpaster.png + + diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h index 929cdccb038..8fbcd752e64 100644 --- a/src/plugins/cpaster/cpasterconstants.h +++ b/src/plugins/cpaster/cpasterconstants.h @@ -37,7 +37,7 @@ namespace Constants { const char CPASTER_SETTINGS_CATEGORY[] = "XZ.CPaster"; const char CPASTER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting"); -const char SETTINGS_CATEGORY_CPASTER_ICON[] = ":/core/images/category_cpaster.png"; +const char SETTINGS_CATEGORY_CPASTER_ICON[] = ":/cpaster/images/category_cpaster.png"; } // namespace Constants } // namespace CodePaster diff --git a/src/plugins/coreplugin/images/category_cpaster.png b/src/plugins/cpaster/images/category_cpaster.png similarity index 100% rename from src/plugins/coreplugin/images/category_cpaster.png rename to src/plugins/cpaster/images/category_cpaster.png