From 8f542758278438defa1b0c582a8e8b7990626a5c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 14 Apr 2025 15:04:25 +0200 Subject: [PATCH] Boot2Qt: Generate qrc file at build time Change-Id: Ifeb1dc122efdf25f822934a560bffd6b95779c3f Reviewed-by: Christian Stenger --- src/plugins/boot2qt/CMakeLists.txt | 10 +++++++++- src/plugins/boot2qt/boot2qt.qbs | 15 ++++++++++++++- src/plugins/boot2qt/qdb.qrc | 8 -------- 3 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 src/plugins/boot2qt/qdb.qrc diff --git a/src/plugins/boot2qt/CMakeLists.txt b/src/plugins/boot2qt/CMakeLists.txt index 26002e6fee7..ed487b10582 100644 --- a/src/plugins/boot2qt/CMakeLists.txt +++ b/src/plugins/boot2qt/CMakeLists.txt @@ -3,7 +3,6 @@ add_qtc_plugin(Boot2Qt DEPENDS Qt::Network PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux SOURCES - qdb.qrc qdb_global.h qdbconstants.h qdbdevice.cpp qdbdevice.h @@ -27,3 +26,12 @@ extend_qtc_plugin(Boot2Qt qdbwatcher.cpp qdbwatcher.h ) +qtc_add_resources(Boot2Qt "images" + PREFIX "/qdb" + BASE "." + FILES + images/qdbdevice.png + images/qdbdevice@2x.png + images/qdbdevicesmall.png + images/qdbdevicesmall@2x.png +) diff --git a/src/plugins/boot2qt/boot2qt.qbs b/src/plugins/boot2qt/boot2qt.qbs index 77aa8a0296b..a81094d00a3 100644 --- a/src/plugins/boot2qt/boot2qt.qbs +++ b/src/plugins/boot2qt/boot2qt.qbs @@ -16,7 +16,6 @@ QtcPlugin { Group { name: "General" files: [ - "qdb.qrc", "qdbutils.cpp", "qdbutils.h", "qdbconstants.h", @@ -54,4 +53,18 @@ QtcPlugin { "qdbmessagetracker.h", ] } + + Group { + name: "images" + prefix: "images/" + files: [ + "qdbdevice.png", + "qdbdevice@2x.png", + "qdbdevicesmall.png", + "qdbdevicesmall@2x.png", + ] + fileTags: "qt.core.resource_data" + Qt.core.resourcePrefix: "/qdb" + Qt.core.resourceSourceBase: sourceDirectory + } } diff --git a/src/plugins/boot2qt/qdb.qrc b/src/plugins/boot2qt/qdb.qrc deleted file mode 100644 index 2855671b057..00000000000 --- a/src/plugins/boot2qt/qdb.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - images/qdbdevice.png - images/qdbdevice@2x.png - images/qdbdevicesmall.png - images/qdbdevicesmall@2x.png - -