diff options
Diffstat (limited to 'share/qbs/imports/qbs')
4 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js index 50605c84b..7e040b756 100644 --- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js +++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js @@ -42,14 +42,14 @@ var _deviceMap = { var _platformMap = { "ios": "iPhone", - "osx": "MacOSX", + "macos": "MacOSX", "tvos": "AppleTV", "watchos": "Watch" }; var _platformDeviceMap = { "ios": ["iphone", "ipad"], - "osx": ["mac"], + "macos": ["mac"], "tvos": ["tv"], "watchos": ["watch"] } diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index 98066a481..9f282c953 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -46,7 +46,7 @@ PathProbe { if (qbs.hostOS.contains("windows")) paths.push(FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"), "Android", "sdk", "ndk-bundle")); - if (qbs.hostOS.contains("osx")) + if (qbs.hostOS.contains("macos")) paths.push(FileInfo.joinPaths(Environment.getEnv("HOME"), "Library", "Android", "sdk", "ndk-bundle")); if (qbs.hostOS.contains("linux")) diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs index 0d10bbffe..acd5c0003 100644 --- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs @@ -39,7 +39,7 @@ PathProbe { platformPaths: { if (qbs.hostOS.contains("windows")) return [FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"), "Android", "sdk")]; - if (qbs.hostOS.contains("osx")) + if (qbs.hostOS.contains("macos")) return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Library", "Android", "sdk")]; if (qbs.hostOS.contains("linux")) return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Android", "Sdk")]; diff --git a/share/qbs/imports/qbs/base/ApplicationExtension.qbs b/share/qbs/imports/qbs/base/ApplicationExtension.qbs index c0bfe9406..1034f5095 100644 --- a/share/qbs/imports/qbs/base/ApplicationExtension.qbs +++ b/share/qbs/imports/qbs/base/ApplicationExtension.qbs @@ -38,7 +38,7 @@ XPCService { cpp.entryPoint: "_NSExtensionMain" cpp.frameworks: { var frameworks = base.concat(["Foundation"]); - if (qbs.targetOS.contains("osx") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 || + if (qbs.targetOS.contains("macos") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 || qbs.targetOS.contains("ios") && parseInt(xcode.sdkVersion.split(".")[0], 10) < 9) { frameworks = base.concat(["/System/Library/PrivateFrameworks/PlugInKit.framework"]); } |