From 523145f600ea9329defbc50febb61630c12c3c57 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Apr 2025 17:12:59 +0200 Subject: [PATCH] GLSLEditor: Generate qrc file at build time Change-Id: I310768cf5b70cf06e6619a333bb350384f57d8ab Reviewed-by: Christian Stenger --- src/plugins/glsleditor/CMakeLists.txt | 7 ++++++- src/plugins/glsleditor/glsleditor.qbs | 9 ++++++++- src/plugins/glsleditor/glsleditor.qrc | 5 ----- 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 src/plugins/glsleditor/glsleditor.qrc diff --git a/src/plugins/glsleditor/CMakeLists.txt b/src/plugins/glsleditor/CMakeLists.txt index 494c27479b5..0e23e08e2fc 100644 --- a/src/plugins/glsleditor/CMakeLists.txt +++ b/src/plugins/glsleditor/CMakeLists.txt @@ -6,10 +6,15 @@ add_qtc_plugin(GLSLEditor glslautocompleter.cpp glslautocompleter.h glslcompletionassist.cpp glslcompletionassist.h glsleditor.cpp glsleditor.h - glsleditor.qrc glsleditorconstants.h glsleditorplugin.cpp glsleditortr.h glslhighlighter.cpp glslhighlighter.h glslindenter.cpp glslindenter.h ) + +qtc_add_resources(GLSLEditor "images" + PREFIX "/glsleditor" + BASE "." + FILES images/glslfile.png +) diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs index 9c1847cce67..5be2623ffcc 100644 --- a/src/plugins/glsleditor/glsleditor.qbs +++ b/src/plugins/glsleditor/glsleditor.qbs @@ -19,7 +19,6 @@ QtcPlugin { "glslcompletionassist.h", "glsleditor.cpp", "glsleditor.h", - "glsleditor.qrc", "glsleditorconstants.h", "glsleditorplugin.cpp", "glsleditortr.h", @@ -28,4 +27,12 @@ QtcPlugin { "glslindenter.cpp", "glslindenter.h", ] + + Group { + name: "images" + files: [ + "images/glslfile.png", + ] + fileTags: "qt.core.resource_data" + } } diff --git a/src/plugins/glsleditor/glsleditor.qrc b/src/plugins/glsleditor/glsleditor.qrc deleted file mode 100644 index 88d7aea098b..00000000000 --- a/src/plugins/glsleditor/glsleditor.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/glslfile.png - -