From 2e37897de1e8aee9e3bba0efb4fd6398bff740df Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 2 Jun 2014 15:47:20 +0200 Subject: [PATCH] FakeVim: Move setting category icon from Core to FakeVim This image is used exclusively in the FakeVim plugin, thus belong into FakeVim resources. Change-Id: I1fcfdb6892a22dd105af72e44e40c799fdf970fd Reviewed-by: hjk --- src/plugins/coreplugin/core.qrc | 1 - src/plugins/fakevim/fakevim.pro | 3 +++ src/plugins/fakevim/fakevim.qbs | 1 + src/plugins/fakevim/fakevim.qrc | 5 +++++ src/plugins/fakevim/fakevimplugin.cpp | 2 +- .../images/category_fakevim.png | Bin 6 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/plugins/fakevim/fakevim.qrc rename src/plugins/{coreplugin => fakevim}/images/category_fakevim.png (100%) diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index b13641a7149..ffffded92c6 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -69,7 +69,6 @@ images/arrowdown@2x.png images/arrowup.png images/arrowup@2x.png - images/category_fakevim.png images/category_locator.png images/category_cpaster.png images/category_cpp.png diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro index 95a5aa5aefa..c6dbaedbaf1 100644 --- a/src/plugins/fakevim/fakevim.pro +++ b/src/plugins/fakevim/fakevim.pro @@ -13,3 +13,6 @@ FORMS += fakevimoptions.ui equals(TEST, 1) { SOURCES += fakevim_test.cpp } + +RESOURCES += \ + fakevim.qrc diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs index e1eb89c4a8d..1417f954363 100644 --- a/src/plugins/fakevim/fakevim.qbs +++ b/src/plugins/fakevim/fakevim.qbs @@ -13,6 +13,7 @@ QtcPlugin { Depends { name: "TextEditor" } files: [ + "fakevim.qrc", "fakevimactions.cpp", "fakevimactions.h", "fakevimhandler.cpp", diff --git a/src/plugins/fakevim/fakevim.qrc b/src/plugins/fakevim/fakevim.qrc new file mode 100644 index 00000000000..73813881986 --- /dev/null +++ b/src/plugins/fakevim/fakevim.qrc @@ -0,0 +1,5 @@ + + + images/category_fakevim.png + + diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 9f35c5ba04e..e23d144a679 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -114,7 +114,7 @@ namespace Internal { const char INSTALL_HANDLER[] = "TextEditor.FakeVimHandler"; const char SETTINGS_CATEGORY[] = "D.FakeVim"; -const char SETTINGS_CATEGORY_FAKEVIM_ICON[] = ":/core/images/category_fakevim.png"; +const char SETTINGS_CATEGORY_FAKEVIM_ICON[] = ":/fakevim/images/category_fakevim.png"; const char SETTINGS_ID[] = "A.General"; const char SETTINGS_EX_CMDS_ID[] = "B.ExCommands"; const char SETTINGS_USER_CMDS_ID[] = "C.UserCommands"; diff --git a/src/plugins/coreplugin/images/category_fakevim.png b/src/plugins/fakevim/images/category_fakevim.png similarity index 100% rename from src/plugins/coreplugin/images/category_fakevim.png rename to src/plugins/fakevim/images/category_fakevim.png