diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-13 12:47:00 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-12-14 09:56:59 +0000 |
| commit | 26fda960e963495c0f6a3394e4c3046e38c9a30e (patch) | |
| tree | 307ea5a3355a0244134e72a8633e3e65f1be7925 /share | |
| parent | fe8a98cdaa467dc5eea9e20d168f8ce92b4520c4 (diff) | |
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 <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/ib/ib.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 |