aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-08-22 17:55:51 -0700
committerJake Petroules <jake.petroules@petroules.com>2015-08-25 20:36:05 +0000
commitd170bb9a8902cdd56c966c8a56da66cbd5d7cf52 (patch)
tree57c49393464e361b1d99c40dc698d5d6acc31b2f
parent648d6d224f3f48c4a413634a9798239c0283aa46 (diff)
Fix ib.appIconName.
actool requires --output-partial-info-plist to be specified if --app-icon is. Change-Id: I558ff6be4f78eaafbee22726b9a00c4fdf7ba82d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--share/qbs/modules/ib/ib.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/ib/ib.js b/share/qbs/modules/ib/ib.js
index f4f9f4c62..a485f298b 100644
--- a/share/qbs/modules/ib/ib.js
+++ b/share/qbs/modules/ib/ib.js
@@ -113,9 +113,9 @@ function ibtooldArguments(product, inputs, outputs, overrideOutput) {
// --target-device and -output-partial-info-plist were introduced in Xcode 6.0 for ibtool
if (ModUtils.moduleProperty(product, "ibtoolVersionMajor") >= 6 || compilingAssetCatalogs) {
- if (outputs && outputs.partial_infoplist) {
- args.push("--output-partial-info-plist", outputs.partial_infoplist[0].filePath);
- }
+ args.push("--output-partial-info-plist", (outputs && outputs.partial_infoplist)
+ ? outputs.partial_infoplist[0].filePath
+ : "/dev/null");
if (product.moduleProperty("qbs", "targetOS").contains("osx"))
args.push("--target-device", "mac");