From 4bdad423f0980ae6fbaf490c36d11ae3f910b5c0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Apr 2025 17:24:38 +0200 Subject: [PATCH] qbs build: Set Qt resource properties centrally Change-Id: Icc9a0fd6e0d2720ac4f331893c5d0fc3da291b22 Reviewed-by: Christian Stenger --- qbs/imports/QtcPlugin.qbs | 4 ++++ src/plugins/android/android.qbs | 2 -- src/plugins/autotest/autotest.qbs | 4 +--- src/plugins/axivion/axivion.qbs | 2 -- src/plugins/boot2qt/boot2qt.qbs | 1 - src/plugins/cppeditor/cppeditor.qbs | 3 --- src/plugins/debugger/debugger.qbs | 3 --- src/plugins/languageclient/languageclient.qbs | 2 -- src/plugins/lua/lua.qbs | 2 -- src/plugins/mesonprojectmanager/mesonprojectmanager.qbs | 1 - src/plugins/projectexplorer/projectexplorer.qbs | 2 -- src/plugins/scxmleditor/scxmleditor.qbs | 1 - src/plugins/webassembly/webassembly.qbs | 2 -- 13 files changed, 5 insertions(+), 24 deletions(-) diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index f4ee221695f..dd71e3edbca 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -34,6 +34,10 @@ QtcProduct { cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined + + Qt.core.resourceSourceBase: sourceDirectory + Qt.core.resourcePrefix: '/' + name.toLowerCase() + pluginjson.useVcsData: false Group { diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 57841482873..421b2018d95 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -102,8 +102,6 @@ QtcPlugin { "androiddevicesmall@2x.png", ] fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "/android" - Qt.core.resourceSourceBase: sourceDirectory } QtcTestFiles { diff --git a/src/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs index b335a4fe07b..3df5b794adf 100644 --- a/src/plugins/autotest/autotest.qbs +++ b/src/plugins/autotest/autotest.qbs @@ -20,8 +20,6 @@ QtcPlugin { Depends { name: "Qt.testlib"; condition: qtc.withPluginTests } Depends { name: "Qt.widgets" } - Qt.core.resourceSourceBase: sourceDirectory - files: [ "autotesticons.h", "autotest_global.h", "autotesttr.h", @@ -129,13 +127,13 @@ QtcPlugin { name: "test data" files: "unit_test/**/*" fileTags: qtc.withPluginTests ? ["qt.core.resource_data"] : [] + Qt.core.resourcePrefix: "" } Group { name: "images" files: "images/*.png" fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "autotest" } Group { diff --git a/src/plugins/axivion/axivion.qbs b/src/plugins/axivion/axivion.qbs index 916229c2386..b557fd57284 100644 --- a/src/plugins/axivion/axivion.qbs +++ b/src/plugins/axivion/axivion.qbs @@ -53,7 +53,5 @@ QtcPlugin { name: "images" files: "images/*.png" fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "/axivion" - Qt.core.resourceSourceBase: sourceDirectory } } diff --git a/src/plugins/boot2qt/boot2qt.qbs b/src/plugins/boot2qt/boot2qt.qbs index a81094d00a3..3ff6ce85242 100644 --- a/src/plugins/boot2qt/boot2qt.qbs +++ b/src/plugins/boot2qt/boot2qt.qbs @@ -65,6 +65,5 @@ QtcPlugin { ] fileTags: "qt.core.resource_data" Qt.core.resourcePrefix: "/qdb" - Qt.core.resourceSourceBase: sourceDirectory } } diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 4d5ceecefd8..8a8d90f42bd 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -24,9 +24,6 @@ QtcPlugin { cpp.defines: "_SCL_SECURE_NO_WARNINGS" } - Qt.core.resourcePrefix: "cppeditor" - Qt.core.resourceSourceBase: sourceDirectory - files: [ "abstracteditorsupport.cpp", "abstracteditorsupport.h", diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index f664652131f..bf69b55da6d 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -23,9 +23,6 @@ QtcPlugin { cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"]) cpp.enableExceptions: true - Qt.core.resourcePrefix: "debugger" - Qt.core.resourceSourceBase: sourceDirectory - Group { name: "General" files: [ diff --git a/src/plugins/languageclient/languageclient.qbs b/src/plugins/languageclient/languageclient.qbs index 180b50c30c6..aa011b46e71 100644 --- a/src/plugins/languageclient/languageclient.qbs +++ b/src/plugins/languageclient/languageclient.qbs @@ -70,8 +70,6 @@ QtcPlugin { name: "images" prefix: "images/" fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "/languageclient" - Qt.core.resourceSourceBase: sourceDirectory files: [ "languageclient.png", "languageclient@2x.png", diff --git a/src/plugins/lua/lua.qbs b/src/plugins/lua/lua.qbs index eca5ebdcc03..e8ad61fb7b6 100644 --- a/src/plugins/lua/lua.qbs +++ b/src/plugins/lua/lua.qbs @@ -89,14 +89,12 @@ QtcPlugin { Group { name: "Lua scripts rcc" - Qt.core.resourcePrefix: "lua/scripts/" fileTags: "qt.core.resource_data" files: "scripts/**" } Group { name: "Lua images rcc" - Qt.core.resourcePrefix: "lua/images/" fileTags: "qt.core.resource_data" files: "images/**" } diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs index 4a24b70ed9b..c3ee3d44707 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs @@ -75,7 +75,6 @@ Project { ] fileTags: "qt.core.resource_data" Qt.core.resourcePrefix: "/mesonproject" - Qt.core.resourceSourceBase: sourceDirectory } } diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 9498dcee21d..3fc1c074e32 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -245,8 +245,6 @@ QtcPlugin { condition: qtc.withPluginTests files: ["testdata/**"] fileTags: ["qt.core.resource_data"] - Qt.core.resourcePrefix: "/projectexplorer" - Qt.core.resourceSourceBase: path } Export { diff --git a/src/plugins/scxmleditor/scxmleditor.qbs b/src/plugins/scxmleditor/scxmleditor.qbs index fa21362c7f5..85a602371db 100644 --- a/src/plugins/scxmleditor/scxmleditor.qbs +++ b/src/plugins/scxmleditor/scxmleditor.qbs @@ -69,7 +69,6 @@ QtcPlugin { name: "images" files: "images/*.png" fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "/scxmleditor" Qt.core.resourceSourceBase: product.sourceDirectory + "/common" } } diff --git a/src/plugins/webassembly/webassembly.qbs b/src/plugins/webassembly/webassembly.qbs index 343f0a236e5..7a16b8938c1 100644 --- a/src/plugins/webassembly/webassembly.qbs +++ b/src/plugins/webassembly/webassembly.qbs @@ -47,7 +47,5 @@ QtcPlugin { "webassemblydevicesmall@2x.png", ] fileTags: "qt.core.resource_data" - Qt.core.resourcePrefix: "webassembly" - Qt.core.resourceSourceBase: sourceDirectory } }