Fix generation of the default Info.plist when building for iOS

Task-number: QBS-1447
Change-Id: Icdd94b7731d1c84a225c53f780e339f9c7034320
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 9 insertions, 4 deletions

diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
index 01aa41ddf..889720fcd 100644
--- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
@@ -78,7 +78,7 @@ function targetDevices(targetOS) {
 function targetedDeviceFamily(deviceNames) {
     return deviceNames.map(function (deviceName) {
         return appleDeviceNumber(deviceName);
-    }).join(",");
+    });
 }
 
 /**
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 0bd294fb4..8f3fe72fc 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -118,8 +118,12 @@ UnixGCC {
             dict["LSRequiresIPhoneOS"] = true;
 
             if (xcode.platformType === "device") {
-                if (qbs.targetOS.contains("ios"))
-                    dict["UIRequiredDeviceCapabilities"] = ["armv7"];
+                if (qbs.targetOS.contains("ios")) {
+                    if (qbs.architecture === "arm64")
+                        dict["UIRequiredDeviceCapabilities"] = ["arm64"];
+                    else
+                        dict["UIRequiredDeviceCapabilities"] = ["armv7"];
+                }
 
                 if (qbs.targetOS.contains("tvos"))
                     dict["UIRequiredDeviceCapabilities"] = ["arm64"];
@@ -195,7 +199,8 @@ UnixGCC {
             env["TVOS_DEPLOYMENT_TARGET"] = minimumTvosVersion;
 
         if (xcode.present)
-            env["TARGETED_DEVICE_FAMILY"] = DarwinTools.targetedDeviceFamily(xcode.targetDevices);
+            env["TARGETED_DEVICE_FAMILY"] =
+                    DarwinTools.targetedDeviceFamily(xcode.targetDevices).join(",");
         return env;
     }