From 26fda960e963495c0f6a3394e4c3046e38c9a30e Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 13 Dec 2020 12:47:00 +0100 Subject: Fix building .xcassets In several cases, actool can create an Info.plist file which is assigned "partial_infoplist" tag and incorrectly used as an output parameter for the "--output-partial-info-plist". Fix that by using the last element in the array which is prepended to the list of artifacts returned by actool in actoolOutputArtifacts() Change-Id: Ide41ceb0f984a5ded91d13b38cc019ab8d804586 Reviewed-by: Christian Kandeler --- share/qbs/modules/ib/ib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qbs/modules/ib') diff --git a/share/qbs/modules/ib/ib.js b/share/qbs/modules/ib/ib.js index 40bd1dc23..ebb615e8e 100644 --- a/share/qbs/modules/ib/ib.js +++ b/share/qbs/modules/ib/ib.js @@ -173,7 +173,7 @@ function ibtooldArguments(product, inputs, input, outputs, overrideOutput) { // --target-device and -output-partial-info-plist were introduced in Xcode 6.0 for ibtool if (ModUtils.moduleProperty(product, "ibtoolVersionMajor") >= 6 || inputs.assetcatalog) { args.push("--output-partial-info-plist", (outputs && outputs.partial_infoplist) - ? outputs.partial_infoplist[0].filePath + ? outputs.partial_infoplist[outputs.partial_infoplist.length - 1].filePath : "/dev/null"); // For iOS, we'd normally only output the devices specified in TARGETED_DEVICE_FAMILY -- cgit v1.2.3