diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-15 00:04:31 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-16 14:25:01 +0000 |
| commit | c84efda483e0333e7963f260ea4eae42a8df4f50 (patch) | |
| tree | da9b29af05ea2ae5bfaedc72da2eab1f7a29ee34 /share/qbs/modules | |
| parent | 95dd760fd77567e6809713bc87dd2830e42c4061 (diff) | |
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>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 11 |
1 files changed, 8 insertions, 3 deletions
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; } |