Merge 1.5 into 1.6

Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d

2 files changed, 2 insertions, 2 deletions

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")) {