diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-06-07 00:06:11 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-06-07 13:45:09 +0000 |
| commit | aedb20891dd628c638bd4302765391b371855bf6 (patch) | |
| tree | fa5cf09ad94291e35fdb9bef8856fb95d7f555ab /share | |
| parent | 1a575d27436ef71e999c709b11e6d7a24e57916e (diff) | |
apple: fix selecting SDK for tvOS
Since Xcode 14.3, there's an additional AssetRuntime.tvOS16.4.sdk
which is wrongly selected by default.
Change-Id: I13759ca8ebd1f4b1a699d1fd2d70fb3d6f5c1a2a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/xcode/xcode.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js index 6bd37ad10..a931273f2 100644 --- a/share/qbs/modules/xcode/xcode.js +++ b/share/qbs/modules/xcode/xcode.js @@ -112,7 +112,7 @@ function sdkInfoList(sdksPath) { if (!sdks[i].match(/[0-9]+/)) continue; - if (sdks[i].startsWith("DriverKit")) + if (sdks[i].startsWith("DriverKit") || sdks[i].startsWith("AssetRuntime")) continue; var settingsPlist = FileInfo.joinPaths(sdksPath, sdks[i], "SDKSettings.plist"); diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index 941b8d395..c052da44c 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -134,6 +134,7 @@ Module { readonly property var _sdkSettings: { if (_availableSdks) { + // see 'sdk' property doc to understand why this loop is needed for (var i in _availableSdks) { if (_availableSdks[i]["Version"] === sdk) return _availableSdks[i]; @@ -141,7 +142,7 @@ Module { return _availableSdks[i]; } - // Latest SDK available for the platform + // Latest SDK available for the platform (default case) if (DarwinTools.applePlatformName(qbs.targetOS, platformType) === sdk) return _latestSdk; } |