Merge 1.5 into 1.6

Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d

6 files changed, 10 insertions, 10 deletions

diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs
index de1de7150..33fe36eae 100644
--- a/src/app/config-ui/config-ui.qbs
+++ b/src/app/config-ui/config-ui.qbs
@@ -14,7 +14,7 @@ QbsApp {
     ]
 
     Group {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         files: [
             "fgapp.mm",
             "Info.plist"
@@ -22,7 +22,7 @@ QbsApp {
     }
 
     Properties {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         cpp.frameworks: ["ApplicationServices", "Cocoa"]
     }
 
diff --git a/src/app/config-ui/fgapp.mm b/src/app/config-ui/fgapp.mm
index ce3f6e0fe..dff92bb40 100644
--- a/src/app/config-ui/fgapp.mm
+++ b/src/app/config-ui/fgapp.mm
@@ -31,7 +31,7 @@
 #import <AppKit/AppKit.h>
 #include <ApplicationServices/ApplicationServices.h>
 
-extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate()
+extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate()
 {
     [[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyRegular];
     [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
diff --git a/src/app/config-ui/main.cpp b/src/app/config-ui/main.cpp
index e5c0876b7..5331f9915 100644
--- a/src/app/config-ui/main.cpp
+++ b/src/app/config-ui/main.cpp
@@ -40,7 +40,7 @@
 
 using qbs::Internal::Tr;
 
-extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate();
+extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate();
 
 int main(int argc, char *argv[])
 {
@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
     // just before UI is shown - this prevents the application icon from popping up in the Dock
     // when running `qbs help`, and QCoreApplication::arguments() requires the application object
     // to be constructed, so it is not easily worked around
-#ifdef Q_OS_OSX
-    qt_osx_forceTransformProcessToForegroundApplicationAndActivate();
+#if defined(Q_OS_MACOS) || defined(Q_OS_OSX)
+    qt_macos_forceTransformProcessToForegroundApplicationAndActivate();
 #endif
     MainWindow mw(clParser.settingsDir());
     mw.show();
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index adae08b65..2480fcdcb 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -289,7 +289,7 @@ static bool isToolchainProfile(const Profile &profile)
     QSet<QString> expected = QSet<QString>()
             << QLatin1String("qbs.toolchain")
             << QLatin1String("qbs.architecture");
-    if (HostOsInfo::isOsxHost())
+    if (HostOsInfo::isMacosHost())
         expected.insert(QLatin1String("qbs.targetOS")); // match only Xcode profiles
     return QSet<QString>(actual).unite(expected) == actual;
 }
@@ -344,7 +344,7 @@ static QStringList qbsTargetOsFromQtMkspec(const QString &mkspec)
         return QStringList() << QLatin1String("lynx") << QLatin1String("unix");
     if (mkspec.startsWith(QLatin1String("macx-")))
         return QStringList() << (mkspec.startsWith(QLatin1String("macx-ios-"))
-                                 ? QLatin1String("ios") : QLatin1String("osx"))
+                                 ? QLatin1String("ios") : QLatin1String("macos"))
                              << QLatin1String("darwin") << QLatin1String("bsd")
                              << QLatin1String("unix");
     if (mkspec.startsWith(QLatin1String("nacl-")) || mkspec.startsWith(QLatin1String("nacl64-")))
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 8a5b306f2..4b33aed77 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -261,7 +261,7 @@ void probe(Settings *settings)
         gccProbe(settings, profiles, QLatin1String("gcc"));
         gccProbe(settings, profiles, QLatin1String("clang"));
 
-        if (HostOsInfo::isOsxHost()) {
+        if (HostOsInfo::isMacosHost()) {
             xcodeProbe(settings, profiles);
         }
     }
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index 91a71ccf0..a23c3e869 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -117,7 +117,7 @@ static QStringList targetOSList(const QString &applePlatformName)
 {
     QStringList targetOS;
     if (applePlatformName == QStringLiteral("macosx")) {
-        targetOS << QStringLiteral("osx");
+        targetOS << QStringLiteral("macos");
     } else if (applePlatformName == QStringLiteral("iphoneos")) {
         targetOS << QStringLiteral("ios");
     } else if (applePlatformName == QStringLiteral("iphonesimulator")) {