qbs build: Move pluginjson replacements property to the module

... where it clearly belongs.

Change-Id: I22d098b701e4921cde53ab34d11ab0078326ab94
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2023-09-14 10:44:58 +02:00
parent b5b61480bd
commit 93273af6dc
5 changed files with 6 additions and 5 deletions

View File

@@ -8,7 +8,6 @@ QtcProduct {
installTags: ["dynamiclibrary", "debuginfo_dll"]
useGuiPchFile: true
property var pluginJsonReplacements
property var pluginRecommends: []
property var pluginTestDepends: []

View File

@@ -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) {

View File

@@ -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" }

View File

@@ -27,7 +27,7 @@ QtcPlugin {
sharedSources.prefix
])
pluginJsonReplacements: ({"DESIGNER_PLUGIN_ARGUMENTS":
pluginjson.replacements: ({"DESIGNER_PLUGIN_ARGUMENTS":
"\"Arguments\" : [\n\
{\n\
\"Name\" : \"-designer-qt-pluginpath\",\n\

View File

@@ -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",