aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-09-27 15:36:36 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-09-28 08:44:56 +0000
commit76ca62e5968125b6674ff267544641f11726d9b9 (patch)
tree1cf58429c0446b73a9329c7253d561edf9d2fe29
parent3700cf6fc8ec25b6c28a641d32074c2eb61d6720 (diff)
Fix default value of qbs.buildVariants
It should be derived from qbs.buildVariant, not from qbs.defaultBuildVariant. Otherwise, overriding qbs.buildVariant from the command line will have no effect on Darwin platforms, where we always multiplex by qbs.buildVariants. Task-number: QBS-1202 Change-Id: I36655d03a1c0e8b01d7a853111d390685ef64a45 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--share/qbs/modules/qbs/common.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 3f65c8d09..262a44317 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -233,7 +233,7 @@ Module {
return architecture ? [architecture] : undefined;
}
- property stringList buildVariants: [defaultBuildVariant]
+ property stringList buildVariants: [buildVariant]
// internal properties
readonly property string version: [versionMajor, versionMinor, versionPatch].join(".")