From 1f6fb901fc32fc2bc9836a3f98a42da0660cc3dc Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 14 Apr 2025 17:36:37 +0200 Subject: [PATCH] WebAssembly: Generate qrc file at build time Change-Id: I999fd200a399b222273c1611802f23df106aa65e Reviewed-by: Alessandro Portale --- src/plugins/webassembly/CMakeLists.txt | 11 ++++++++++- src/plugins/webassembly/webassembly.qbs | 15 ++++++++++++++- src/plugins/webassembly/webassembly.qrc | 8 -------- 3 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 src/plugins/webassembly/webassembly.qrc diff --git a/src/plugins/webassembly/CMakeLists.txt b/src/plugins/webassembly/CMakeLists.txt index 03c696a8db9..e1da35d88f4 100644 --- a/src/plugins/webassembly/CMakeLists.txt +++ b/src/plugins/webassembly/CMakeLists.txt @@ -2,7 +2,6 @@ add_qtc_plugin(WebAssembly DEPENDS Qt::Core PLUGIN_DEPENDS Core ProjectExplorer QtSupport SOURCES - webassembly.qrc webassembly_global.h webassemblyconstants.h webassemblydevice.cpp webassemblydevice.h @@ -21,3 +20,13 @@ extend_qtc_plugin(WebAssembly webassembly_test.cpp webassembly_test.h ) + +qtc_add_resources(WebAssembly "images" + PREFIX "/webassembly" + BASE "." + FILES + images/webassemblydevice.png + images/webassemblydevice@2x.png + images/webassemblydevicesmall.png + images/webassemblydevicesmall@2x.png +) diff --git a/src/plugins/webassembly/webassembly.qbs b/src/plugins/webassembly/webassembly.qbs index 46ff11ebe7e..343f0a236e5 100644 --- a/src/plugins/webassembly/webassembly.qbs +++ b/src/plugins/webassembly/webassembly.qbs @@ -12,7 +12,6 @@ QtcPlugin { Depends { name: "QtSupport" } files: [ - "webassembly.qrc", "webassembly_global.h", "webassemblyconstants.h", "webassemblydevice.cpp", @@ -37,4 +36,18 @@ QtcPlugin { "webassembly_test.h", ] } + + Group { + name: "images" + prefix: "images/" + files: [ + "webassemblydevice.png", + "webassemblydevice@2x.png", + "webassemblydevicesmall.png", + "webassemblydevicesmall@2x.png", + ] + fileTags: "qt.core.resource_data" + Qt.core.resourcePrefix: "webassembly" + Qt.core.resourceSourceBase: sourceDirectory + } } diff --git a/src/plugins/webassembly/webassembly.qrc b/src/plugins/webassembly/webassembly.qrc deleted file mode 100644 index 6b6ac54a4be..00000000000 --- a/src/plugins/webassembly/webassembly.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - images/webassemblydevice.png - images/webassemblydevice@2x.png - images/webassemblydevicesmall.png - images/webassemblydevicesmall@2x.png - -