From 93273af6dc2ee18c5748bd267628ce3d6cff2d5f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 14 Sep 2023 10:44:58 +0200 Subject: [PATCH] qbs build: Move pluginjson replacements property to the module ... where it clearly belongs. Change-Id: I22d098b701e4921cde53ab34d11ab0078326ab94 Reviewed-by: Reviewed-by: Christian Stenger --- qbs/imports/QtcPlugin.qbs | 1 - qbs/modules/pluginjson/pluginjson.qbs | 4 +++- src/plugins/clearcase/clearcase.qbs | 2 +- src/plugins/designer/designer.qbs | 2 +- src/plugins/updateinfo/updateinfo.qbs | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 9e5a743e12a..221789ef605 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -8,7 +8,6 @@ QtcProduct { installTags: ["dynamiclibrary", "debuginfo_dll"] useGuiPchFile: true - property var pluginJsonReplacements property var pluginRecommends: [] property var pluginTestDepends: [] diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index f52158c9652..9a200cf83f7 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -8,6 +8,8 @@ Module { Depends { id: qtcore; name: "Qt.core" } Depends { name: "qtc" } + property var replacements + // TODO: Wrap the VCS specific stuff in a dedicated module property bool hasVcs: Utilities.versionCompare(qbs.version, "1.10") >= 0 property bool useVcsData: hasVcs @@ -52,7 +54,7 @@ Module { var cmd = new JavaScriptCommand(); cmd.description = "prepare " + FileInfo.fileName(output.filePath); cmd.highlight = "codegen"; - cmd.pluginJsonReplacements = product.pluginJsonReplacements; + cmd.pluginJsonReplacements = product.pluginjson.replacements; cmd.plugin_depends = []; var deps = product.dependencies; for (var d in deps) { diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index 2b65135f8de..a69303bded4 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -3,7 +3,7 @@ import qbs 1.0 QtcPlugin { name: "ClearCase" - pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("macos") ? "true": "false")}) + pluginjson.replacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("macos") ? "true": "false")}) Depends { name: "Qt.widgets" } Depends { name: "Utils" } diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index 88bfb1df6be..bde63fa3eea 100644 --- a/src/plugins/designer/designer.qbs +++ b/src/plugins/designer/designer.qbs @@ -27,7 +27,7 @@ QtcPlugin { sharedSources.prefix ]) - pluginJsonReplacements: ({"DESIGNER_PLUGIN_ARGUMENTS": + pluginjson.replacements: ({"DESIGNER_PLUGIN_ARGUMENTS": "\"Arguments\" : [\n\ {\n\ \"Name\" : \"-designer-qt-pluginpath\",\n\ diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index fc294e2a132..cdef4fc5105 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -9,7 +9,7 @@ QtcPlugin { Depends { name: "Core" } property bool enable: false - pluginJsonReplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) + pluginjson.replacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) files: [ "settingspage.cpp",