diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-23 19:17:07 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-23 19:17:07 +0200 |
| commit | 4a12d020600643d6fcbf65a3da7bc1c21fda6970 (patch) | |
| tree | fe5f3c8061530d9ac49a6cc54377ed1ef87915b0 /share/qbs/modules | |
| parent | eb78330fcf98e56968ae5d436d17bc114b8a4890 (diff) | |
| parent | 8cd4b8cec7ffda0b19b01129e96eda8d2fb75ec0 (diff) | |
Merge 1.13 into master
Change-Id: Ic8e80604deb03e48fe264271de2e0add5023af87
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 11 |
2 files changed, 10 insertions, 4 deletions
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]; } } 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; } |