Fix qbs build on macOS

"osx" -> "macos"

Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

24 files changed, 45 insertions, 45 deletions

diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index 35d67e7af2..586626b22d 100644
--- a/qbs/imports/QtcAutotest.qbs
+++ b/qbs/imports/QtcAutotest.qbs
@@ -26,7 +26,7 @@ QtcProduct {
     // The following would be conceptually right, but does not work currently as some autotests
     // (e.g. extensionsystem) do not work when installed, because they want hardcoded
     // absolute paths to resources in the build directory.
-    //    cpp.rpaths: qbs.targetOS.contains("osx")
+    //    cpp.rpaths: qbs.targetOS.contains("macos")
     //            ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
     //            : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator",
     //               "$ORIGIN/../" qtc.libDirName + "/qtcreator/plugins"]
diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs
index 350033be17..c98ee8dec3 100644
--- a/qbs/imports/QtcDocumentation.qbs
+++ b/qbs/imports/QtcDocumentation.qbs
@@ -28,7 +28,7 @@ Product {
 
     Group {
         fileTagsFilter: ["qch"]
-        qbs.install: !qbs.targetOS.contains("osx")
+        qbs.install: !qbs.targetOS.contains("macos")
         qbs.installDir: qtc.ide_doc_path
     }
 }
diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js
index 23a51f80e8..c9dd1cf3a0 100644
--- a/qbs/imports/QtcFunctions/functions.js
+++ b/qbs/imports/QtcFunctions/functions.js
@@ -4,7 +4,7 @@ function qtLibraryName(qbs, name)
     if (qbs.debugInformation) {
         if (qbs.targetOS.contains("windows"))
             return name + "d";
-        else if (qbs.targetOS.contains("osx"))
+        else if (qbs.targetOS.contains("macos"))
             return name + "_debug";
     }
     return name;
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index e4dd782b11..5c54ba8894 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -18,14 +18,14 @@ QtcProduct {
         var flags = base;
         if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
             flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             flags.push("-compatibility_version", qtc.qtcreator_compat_version);
         return flags;
     }
-    cpp.sonamePrefix: qbs.targetOS.contains("osx")
+    cpp.sonamePrefix: qbs.targetOS.contains("macos")
             ? "@rpath"
             : undefined
-    cpp.rpaths: qbs.targetOS.contains("osx")
+    cpp.rpaths: qbs.targetOS.contains("macos")
             ? ["@loader_path/../Frameworks"]
             : ["$ORIGIN", "$ORIGIN/.."]
     property string libIncludeBase: ".." // #include <lib/header.h>
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index e18607ffba..8d68c234fe 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -27,17 +27,17 @@ QtcProduct {
 
     cpp.internalVersion: ""
     cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"])
-    cpp.sonamePrefix: qbs.targetOS.contains("osx")
+    cpp.sonamePrefix: qbs.targetOS.contains("macos")
         ? "@rpath"
         : undefined
-    cpp.rpaths: qbs.targetOS.contains("osx")
+    cpp.rpaths: qbs.targetOS.contains("macos")
         ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
         : ["$ORIGIN", "$ORIGIN/.."]
     cpp.linkerFlags: {
         var flags = base;
         if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
             flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             flags.push("-compatibility_version", qtc.qtcreator_compat_version);
         return flags;
     }
diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs
index e8dd54efaa..304e2e87a9 100644
--- a/qbs/imports/QtcTool.qbs
+++ b/qbs/imports/QtcTool.qbs
@@ -12,7 +12,7 @@ QtcProduct {
                                                        '/' + qtc.ide_library_path);
         var relativePathToPlugins = FileInfo.relativePath('/' + qtc.ide_libexec_path,
                                                           '/' + qtc.ide_plugin_path);
-        var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN";
+        var prefix = qbs.targetOS.contains("macos") ? "@executable_path" : "$ORIGIN";
         return [
             FileInfo.joinPaths(prefix, relativePathToLibs),
             FileInfo.joinPaths(prefix, relativePathToPlugins)
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 88128a97d1..00d2d34bdd 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -8,7 +8,7 @@ Module {
     property bool enableProjectFileUpdates: true
     property bool installApiHeaders: false
     property string libInstallDir: qtc.ide_library_path
-    property stringList libRPaths: qbs.targetOS.contains("osx")
+    property stringList libRPaths: qbs.targetOS.contains("macos")
             ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
             : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path]
     property string resourcesInstallDir: qtc.ide_data_path + "/qbs"
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 955850dfa9..65ea37e714 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -16,10 +16,10 @@ Module {
             + ide_compat_version_minor + '.' + ide_compat_version_release
 
     property string libDirName: "lib"
-    property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
-    property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
+    property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin"
+    property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator"
     property string ide_library_path: {
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             return ide_app_target + ".app/Contents/Frameworks"
         else if (qbs.targetOS.contains("windows"))
             return ide_app_path
@@ -27,24 +27,24 @@ Module {
             return libDirName + "/qtcreator"
     }
     property string ide_plugin_path: {
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             return ide_app_target + ".app/Contents/PlugIns"
         else if (qbs.targetOS.contains("windows"))
             return libDirName + "/qtcreator/plugins"
         else
             return ide_library_path + "/plugins"
     }
-    property string ide_data_path: qbs.targetOS.contains("osx")
+    property string ide_data_path: qbs.targetOS.contains("macos")
             ? ide_app_target + ".app/Contents/Resources"
             : "share/qtcreator"
-    property string ide_libexec_path: qbs.targetOS.contains("osx")
+    property string ide_libexec_path: qbs.targetOS.contains("macos")
             ? ide_data_path : qbs.targetOS.contains("windows")
             ? ide_app_path
             : "libexec/qtcreator"
-    property string ide_bin_path: qbs.targetOS.contains("osx")
+    property string ide_bin_path: qbs.targetOS.contains("macos")
             ? ide_app_target + ".app/Contents/MacOS"
             : ide_app_path
-    property string ide_doc_path: qbs.targetOS.contains("osx")
+    property string ide_doc_path: qbs.targetOS.contains("macos")
             ? ide_data_path + "/doc"
             : "share/doc/qtcreator"
     property string ide_include_path: "include"
diff --git a/share/share.qbs b/share/share.qbs
index df3e418bf4..08688ec092 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -55,7 +55,7 @@ Product {
             ]
             if (qbs.targetOS.contains("windows"))
                 list.push("notepad_win.xml");
-            else if (qbs.targetOS.contains("osx"))
+            else if (qbs.targetOS.contains("macos"))
                 list.push("vi_mac.xml");
             else
                 list.push("vi.xml");
diff --git a/src/app/app.qbs b/src/app/app.qbs
index db720637db..2eac52ac64 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -2,10 +2,10 @@ import qbs
 
 QtcProduct {
     Depends { name: "bundle" }
-    Depends { name: "ib"; condition: qbs.targetOS.contains("osx") }
+    Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
 
     Properties {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         ib.appIconName: "qtcreator"
     }
 
@@ -23,7 +23,7 @@ QtcProduct {
     installDir: qtc.ide_bin_path
     property bool qtcRunnable: true
 
-    cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"]
+    cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"]
                                              : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"]
     cpp.includePaths: [
         project.sharedSourcesDir + "/qtsingleapplication",
@@ -51,7 +51,7 @@ QtcProduct {
 
     Group {
         name: "qtcreator.sh"
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
         files: "../../bin/qtcreator.sh"
         qbs.install: true
         qbs.installDir: "bin"
@@ -74,7 +74,7 @@ QtcProduct {
     }
 
     Group {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"]
         qbs.install: true
         qbs.installSourceBase: product.buildDirectory
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index e3ef0cf3f5..c79dacb79f 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -69,7 +69,7 @@ Project {
                 result.push("advapi32", "user32")
             else if (qbs.targetOS.contains("linux"))
                 result.push("rt", "dl");
-            else if (qbs.targetOS.contains("osx"))
+            else if (qbs.targetOS.contains("macos"))
                 result.push("dl");
             else if (qbs.targetOS.contains("unix"))
                 result.push("rt");
@@ -95,7 +95,7 @@ Project {
                                 "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
                                 "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
                                 "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
-                if (qbs.targetOS.contains("osx"))
+                if (qbs.targetOS.contains("macos"))
                     result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
                                 "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
                                 "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index dc5e7b71e9..8b41c2f602 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -18,7 +18,7 @@ Project {
             if (qbs.targetOS.contains("windows")) {
                 libs.push("user32", "iphlpapi", "ws2_32", "shell32");
             } else if (qbs.targetOS.contains("unix")) {
-                if (!qbs.targetOS.contains("osx"))
+                if (!qbs.targetOS.contains("macos"))
                     libs.push("X11");
                 if (!qbs.targetOS.contains("openbsd"))
                     libs.push("pthread");
@@ -29,7 +29,7 @@ Project {
         cpp.enableExceptions: true
 
         Properties {
-            condition: qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("macos")
             cpp.frameworks: ["Foundation"]
         }
 
@@ -278,7 +278,7 @@ Project {
 
         Group {
             name: "FileUtils_osx"
-            condition: qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("macos")
             files: [
                 "fileutils_mac.h", "fileutils_mac.mm",
             ]
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 2c52f4690a..9fd072a28e 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -3,7 +3,7 @@ import qbs 1.0
 QtcPlugin {
     name: "ClearCase"
 
-    pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
+    pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("macos") ? "true": "false")})
 
     Depends { name: "Qt.widgets" }
     Depends { name: "Utils" }
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index d2e2c7d268..ed50f54985 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -27,7 +27,7 @@ Project {
                 return ["ole32", "user32"]
         }
 
-        cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined
+        cpp.frameworks: qbs.targetOS.contains("macos") ? ["AppKit"] : undefined
 
         Group {
             name: "General"
@@ -176,7 +176,7 @@ Project {
 
         Group {
             name: "ProgressManager_mac"
-            condition: qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("macos")
             files: [
                 "progressmanager/progressmanager_mac.mm",
             ]
@@ -184,7 +184,7 @@ Project {
 
         Group {
             name: "ProgressManager_x11"
-            condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
             files: [
                 "progressmanager/progressmanager_x11.cpp",
             ]
@@ -288,7 +288,7 @@ Project {
 
         Group {
             name: "Locator_mac"
-            condition: qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("macos")
             files: [
                 "locator/spotlightlocatorfilter.h",
                 "locator/spotlightlocatorfilter.mm",
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index 0eb70f2f10..e38618c7a4 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
-    cpp.frameworks: base.concat(qbs.targetOS.contains("osx") ? ["CoreFoundation", "IOKit"] : [])
+    cpp.frameworks: base.concat(qbs.targetOS.contains("macos") ? ["CoreFoundation", "IOKit"] : [])
 
     files: [
         "ios.qrc",
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index af6b8fbc8a..e7103ce1da 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -17,7 +17,7 @@ Project {
 
         cpp.defines: base.concat("QTC_CPU=X86Architecture")
         Properties {
-            condition: qbs.targetOS.contains("osx")
+            condition: qbs.targetOS.contains("macos")
             cpp.frameworks: base.concat(["Carbon"])
         }
 
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
index 55f6c6a1df..e8a5cae40b 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
@@ -4,7 +4,7 @@ QtcProduct {
     name: "componentsplugin"
     type: ["dynamiclibrary"]
     installDir: qtc.ide_plugin_path + '/' + installDirName
-    property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
+    property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
 
     Depends { name: "Core" }
     Depends { name: "QmlDesigner" }
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
index 60f0711674..56f5a83d87 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
@@ -4,7 +4,7 @@ QtcProduct {
     name: "qtquickplugin"
     type: ["dynamiclibrary"]
     installDir: qtc.ide_plugin_path + '/' + installDirName
-    property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
+    property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
 
     cpp.defines: base.concat("QTQUICK_LIBRARY")
     cpp.includePaths: base.concat("../designercore/include")
diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs
index 3c55f5f649..5a7f642563 100644
--- a/src/tools/3rdparty/iossim/iossim.qbs
+++ b/src/tools/3rdparty/iossim/iossim.qbs
@@ -2,7 +2,7 @@ import qbs 1.0
 
 QtcTool {
     name: "iossim"
-    condition: qbs.targetOS.contains("osx")
+    condition: qbs.targetOS.contains("macos")
 
     Depends { name: "bundle" }
     Depends { name: "Qt"; submodules: ["widgets"] }
diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs
index ce138f7a20..f2537dad06 100644
--- a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs
+++ b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs
@@ -4,7 +4,7 @@ import QtcTool
 
 QtcTool {
     name: "iossim"
-    condition: qbs.targetOS.contains("osx")
+    condition: qbs.targetOS.contains("macos")
 
     Depends { name: "Qt"; submodules: ["widgets"] }
     Depends { name: "app_version_header" }
diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs
index 83684c17f9..7f154f963d 100644
--- a/src/tools/clangbackend/clangbackend.qbs
+++ b/src/tools/clangbackend/clangbackend.qbs
@@ -24,7 +24,7 @@ QtcTool {
     cpp.rpaths: base.concat(libclang.llvmLibDir)
 
     Properties {
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
         cpp.linkerFlags: base.concat(["-z", "origin"])
     }
 }
diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs
index 53fc2b74e3..b06d996e00 100644
--- a/src/tools/iostool/iostool.qbs
+++ b/src/tools/iostool/iostool.qbs
@@ -2,7 +2,7 @@ import qbs 1.0
 
 QtcTool {
     name: "iostool"
-    condition: qbs.targetOS.contains("osx")
+    condition: qbs.targetOS.contains("macos")
 
     Depends { name: "bundle" }
     Depends { name: "Qt.widgets" }
diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs
index 0395e8b777..e5fe8f44d7 100644
--- a/src/tools/qml2puppet/qml2puppet.qbs
+++ b/src/tools/qml2puppet/qml2puppet.qbs
@@ -3,7 +3,7 @@ import QtcFunctions
 
 QtcTool {
     name: "qml2puppet"
-    installDir: qbs.targetOS.contains("osx")
+    installDir: qbs.targetOS.contains("macos")
                 ? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path
 
     Depends { name: "bundle" }
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index be97b82750..a031232aba 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -7,7 +7,7 @@ QtcTool {
     Depends { name: "Utils" }
     Depends { name: "app_version_header" }
 
-    cpp.defines: base.concat([qbs.targetOS.contains("osx")
+    cpp.defines: base.concat([qbs.targetOS.contains("macos")
             ? 'DATA_PATH="."'
             : qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
                                                : 'DATA_PATH="../../share/qtcreator"'])