aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-09-25 17:24:50 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-09-25 17:51:40 +0200
commitd324f213c0f339fd0af5669cb022b0744d12bd19 (patch)
tree07440753b0a52d8d4424f6aba763ae9c62f0d570 /share
parente6949e7e24ca6670b93658953851eae1ae9a8952 (diff)
fix property values of Application.type and friends
Product.type is an array of strings, not a string. Using a string literal here breaks the base.concat pattern in derived products. Task-number: QBS-675 Change-Id: I83aef275cd6ad524062382afe40a59bc2a47a787 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/imports/qbs/base/Application.qbs2
-rw-r--r--share/qbs/imports/qbs/base/DynamicLibrary.qbs2
-rw-r--r--share/qbs/imports/qbs/base/StaticLibrary.qbs2
3 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs
index 24b351499..cf57289df 100644
--- a/share/qbs/imports/qbs/base/Application.qbs
+++ b/share/qbs/imports/qbs/base/Application.qbs
@@ -1,4 +1,4 @@
Product {
property string bundleExtension
- type: qbs.targetOS.contains("darwin") ? "applicationbundle" : "application"
+ type: qbs.targetOS.contains("darwin") ? ["applicationbundle"] : ["application"]
}
diff --git a/share/qbs/imports/qbs/base/DynamicLibrary.qbs b/share/qbs/imports/qbs/base/DynamicLibrary.qbs
index fbe6a77ad..a00bde90f 100644
--- a/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+++ b/share/qbs/imports/qbs/base/DynamicLibrary.qbs
@@ -1,4 +1,4 @@
Product {
property string bundleExtension
- type: "dynamiclibrary"
+ type: ["dynamiclibrary"]
}
diff --git a/share/qbs/imports/qbs/base/StaticLibrary.qbs b/share/qbs/imports/qbs/base/StaticLibrary.qbs
index da0416bee..29db4b8f8 100644
--- a/share/qbs/imports/qbs/base/StaticLibrary.qbs
+++ b/share/qbs/imports/qbs/base/StaticLibrary.qbs
@@ -1,3 +1,3 @@
Product {
- type: "staticlibrary"
+ type: ["staticlibrary"]
}