diff --git a/src/plugins/mesonprojectmanager/CMakeLists.txt b/src/plugins/mesonprojectmanager/CMakeLists.txt index 2b2f9ced3b8..ffc82ce26ed 100644 --- a/src/plugins/mesonprojectmanager/CMakeLists.txt +++ b/src/plugins/mesonprojectmanager/CMakeLists.txt @@ -37,7 +37,6 @@ add_qtc_plugin(MesonProjectManager mesontools.h ninjaparser.cpp ninjaparser.h - resources_meson.qrc settings.cpp settings.h target.h @@ -51,6 +50,15 @@ add_qtc_plugin(MesonProjectManager toolssettingspage.h ) +qtc_add_resources(MesonProjectManager "images" + PREFIX "/mesonproject" + BASE "." + FILES + icons/meson_logo.png + icons/meson_bw_logo.png + icons/meson_bw_logo@2x.png +) + file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_LIBEXEC_PATH}") diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs index 2f4e23aedc5..4a24b70ed9b 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs @@ -53,7 +53,6 @@ Project { "ninjaparser.h", "mesonprojectnodes.cpp", "mesonprojectnodes.h", - "resources_meson.qrc", "settings.cpp", "settings.h", "toolkitaspectwidget.cpp", @@ -65,6 +64,19 @@ Project { "toolssettingspage.cpp", "toolssettingspage.h", ] + + Group { + name: "images" + prefix: "icons/" + files: [ + "meson_logo.png", + "meson_bw_logo.png", + "meson_bw_logo@2x.png", + ] + fileTags: "qt.core.resource_data" + Qt.core.resourcePrefix: "/mesonproject" + Qt.core.resourceSourceBase: sourceDirectory + } } QtcAutotest { diff --git a/src/plugins/mesonprojectmanager/resources_meson.qrc b/src/plugins/mesonprojectmanager/resources_meson.qrc deleted file mode 100644 index eb7fd47f0de..00000000000 --- a/src/plugins/mesonprojectmanager/resources_meson.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - icons/meson_logo.png - icons/meson_bw_logo.png - icons/meson_bw_logo@2x.png - -