diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2018-11-01 22:41:52 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2018-11-05 20:46:15 +0000 |
| commit | 932d25082da2965c55a13785cca848692d9c8b9b (patch) | |
| tree | b88abb7541936ea85b2507ccae54cca56e319ed3 /share | |
| parent | 7dab0863ed58646e356f48bc5ab5e0a3353a74ed (diff) | |
Fix detecting path to the MacOSX.platform
It was incorrectly detected by appending OS suffix which wrong as there
is no OSX Simulator
Change-Id: I19e8b06f51e65a897eae3cc018e994ed696b1d7e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/DarwinTools/darwin-tools.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js index 95e8dab25..01aa41ddf 100644 --- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js +++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js @@ -98,8 +98,11 @@ function applePlatformDirectoryName(targetOSList, platformType, version, throwOn }; for (var key in _platformMap) { - if (targetOSList.contains(key)) - return _platformMap[key] + (suffixMap[platformType] || "") + (version || ""); + if (targetOSList.contains(key)) { + // there are no MacOSXOS or MacOSXSimulator platforms + var suffix = (key !== "macos") ? (suffixMap[platformType] || "") : ""; + return _platformMap[key] + suffix + (version || ""); + } } if (throwOnError || throwOnError === undefined) |