aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/bundle/BundleModule.qbs
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@theqtcompany.com>2015-09-09 19:12:13 -0700
committerJake Petroules <jake.petroules@theqtcompany.com>2015-09-11 10:31:37 +0000
commit26f5a886ed4aa3c9b7a0a9c2d15494054033bb99 (patch)
tree1bac4d4c603e2a0568d3f12e84cbdbf4ecfeef9c /share/qbs/modules/bundle/BundleModule.qbs
parent216ad20c09f160722598a6780e4271f0010bc616 (diff)
Fix "else assumptions" and other conditionals relating to Apple OSes.
Change-Id: I0d495d629919a19169a081abaa5a793b9dd251c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
-rw-r--r--share/qbs/modules/bundle/BundleModule.qbs5
1 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index 0e3d9bb13..833aeb68b 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -45,7 +45,7 @@ Module {
|| product.type.contains("dynamiclibrary")
|| product.type.contains("loadablemodule"))
&& !product.consoleApplication
- property bool isShallow: qbs.targetOS.contains("ios") && product.type.contains("application")
+ property bool isShallow: !qbs.targetOS.contains("osx") && product.type.contains("application")
property string identifierPrefix: "org.example"
property string identifier: [identifierPrefix, qbs.rfc1034Identifier(product.targetName)].join(".")
@@ -102,8 +102,7 @@ Module {
property string infoPlistFormat: {
if (qbs.targetOS.contains("osx"))
return infoPlistFile ? "same-as-input" : "xml1";
- else if (qbs.targetOS.contains("ios"))
- return "binary1";
+ return "binary1";
}
property string localizedResourcesFolderSuffix: ".lproj"