aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-09-18 15:30:22 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-09-19 09:55:40 +0000
commit4def80e1bfa9c844e6b8b25db25759359cba0f9d (patch)
tree76cf67ebfcfa2aad7efd7218bf451109dff6ce02
parent9a0f61b7e26bdfe8fa404e59bbad78cb8f860264 (diff)
qbs build: Fix wrong usages of base.concat()
Change-Id: I806c6beb35eb5765b5da97e356a13c3dcb1ddda3 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r--src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs2
-rw-r--r--src/shared/proparser/proparser.qbs6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
index acf111798f7..d6558880f8e 100644
--- a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
+++ b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
@@ -97,6 +97,6 @@ QtcLibrary {
Export {
Depends { name: "cpp" }
cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
- cpp.defines: base.concat(["YAML_CPP_DLL"])
+ cpp.defines: "YAML_CPP_DLL"
}
}
diff --git a/src/shared/proparser/proparser.qbs b/src/shared/proparser/proparser.qbs
index dd9ce7cc64b..290ffdff5d8 100644
--- a/src/shared/proparser/proparser.qbs
+++ b/src/shared/proparser/proparser.qbs
@@ -6,13 +6,13 @@ Product {
Export {
Depends { name: "cpp" }
- cpp.defines: base.concat([
+ cpp.defines: [
"QMAKE_AS_LIBRARY",
"PROPARSER_THREAD_SAFE",
"PROEVALUATOR_THREAD_SAFE",
"PROEVALUATOR_CUMULATIVE",
"PROEVALUATOR_SETENV",
- ])
- cpp.includePaths: base.concat([exportingProduct.sourceDirectory + "/.."])
+ ]
+ cpp.includePaths: exportingProduct.sourceDirectory + "/.."
}
}