From c84efda483e0333e7963f260ea4eae42a8df4f50 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 15 May 2019 00:04:31 +0200 Subject: Fix generation of the default Info.plist when building for iOS Task-number: QBS-1447 Change-Id: Icdd94b7731d1c84a225c53f780e339f9c7034320 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/DarwinGCC.qbs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'share/qbs/modules') 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; } -- cgit v1.2.3 From 42c99ec8f78b3581c3b766d9867ea8797d068280 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 15 May 2019 20:21:49 +0200 Subject: Do not override properties that are present in user plist Fixes: QBS-1447 Change-Id: Ie03530e960cbcf0ab14a9cb501a169aec311ec1a Reviewed-by: Christian Kandeler --- share/qbs/modules/bundle/BundleModule.qbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share/qbs/modules') diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index ec0062347..f1845fe30 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -426,7 +426,8 @@ Module { inputs.partial_infoplist[j].filePath) || {}; for (key in partialInfoPlist) { - if (partialInfoPlist.hasOwnProperty(key)) + if (partialInfoPlist.hasOwnProperty(key) + && !aggregatePlist.hasOwnProperty(key)) aggregatePlist[key] = partialInfoPlist[key]; } } -- cgit v1.2.3