Do the OS X to macOS rename.v1.5.2

[ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been
replaced with "macos". For backwards compatibility, qbs.hostOS will
still contain "osx" in addition to "macos", and an error will be printed
if qbs.targetOS contains "osx" but not "macos". Specifying "macos"
without "osx" is allowed. These checks are subject to be removed in a
future version of qbs, so update your hostOS and targetOS checks
accordingly.

[ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with
cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed
in a future version of qbs, so update your projects accordingly.

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

17 files changed, 39 insertions, 39 deletions

diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs
index 3f31765c1..957824f74 100644
--- a/src/app/config-ui/config-ui.qbs
+++ b/src/app/config-ui/config-ui.qbs
@@ -14,12 +14,12 @@ QbsApp {
     ]
 
     Group {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         files: ["fgapp.mm"]
     }
 
     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 c40271357..c65fa78cb 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 728c28739..33f67c19f 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -279,7 +279,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")) {
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 27f058621..3231777d5 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -407,8 +407,8 @@ QbsLibrary {
         ]
     }
     Group {
-        condition: qbs.targetOS.contains("osx")
-        name: "tools (OS X)"
+        condition: qbs.targetOS.contains("macos")
+        name: "tools (macOS)"
         prefix: "tools/"
         files: [
             "applecodesignutils.cpp",
diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm
index 0306310c5..65b37f6ae 100644
--- a/src/lib/corelib/jsextensions/propertylist.mm
+++ b/src/lib/corelib/jsextensions/propertylist.mm
@@ -322,7 +322,7 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri
 #endif
             else {
                 errorString = @"JSON serialization of property lists is not "
-                              @"supported on this version of OS X";
+                              @"supported on this version of macOS";
             }
         } else if (format == QLatin1String("xml1") || format == QLatin1String("binary1")) {
             const NSPropertyListFormat plistFormat = format == QLatin1String("xml1")
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp
index f4ca809de..52335b02a 100644
--- a/src/lib/corelib/jsextensions/utilitiesextension.cpp
+++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp
@@ -35,7 +35,7 @@
 #include <tools/architectures.h>
 #include <tools/fileinfo.h>
 
-#ifdef Q_OS_OSX
+#if defined(Q_OS_MACOS) || defined(Q_OS_OSX)
 #include <tools/applecodesignutils.h>
 #endif
 
@@ -174,7 +174,7 @@ QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context,
 QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context,
                                                         QScriptEngine *engine)
 {
-#ifndef Q_OS_OSX
+#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
     Q_UNUSED(engine);
     return context->throwError(QScriptContext::UnknownError,
         QLatin1String("smimeMessageContent is not available on this platform"));
@@ -198,7 +198,7 @@ QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context,
 QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context,
                                                     QScriptEngine *engine)
 {
-#ifndef Q_OS_OSX
+#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
     Q_UNUSED(engine);
     return context->throwError(QScriptContext::UnknownError,
         QLatin1String("certificateInfo is not available on this platform"));
@@ -214,7 +214,7 @@ QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context,
 QScriptValue UtilitiesExtension::js_signingIdentities(QScriptContext *context,
                                                       QScriptEngine *engine)
 {
-#ifndef Q_OS_OSX
+#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
     Q_UNUSED(engine);
     return context->throwError(QScriptContext::UnknownError,
         QLatin1String("signingIdentities is not available on this platform"));
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index f878cfc0f..2197dc349 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1349,8 +1349,8 @@ static QStringList hostOS()
 #if defined(Q_OS_LYNX)
     hostSystem << QLatin1String("lynx");
 #endif
-#if defined(Q_OS_OSX)
-    hostSystem << QLatin1String("osx");
+#if defined(Q_OS_MACOS) || defined(Q_OS_OSX)
+    hostSystem << QLatin1String("macos") << QLatin1String("osx");
 #endif
 #if defined(Q_OS_MSDOS)
     hostSystem << QLatin1String("msdos");
diff --git a/src/lib/corelib/language/testdata/getNativeSetting.qbs b/src/lib/corelib/language/testdata/getNativeSetting.qbs
index 122b0e657..ab2943499 100644
--- a/src/lib/corelib/language/testdata/getNativeSetting.qbs
+++ b/src/lib/corelib/language/testdata/getNativeSetting.qbs
@@ -4,7 +4,7 @@ import qbs.Utilities
 Project {
     Product {
         name: {
-            if (qbs.hostOS.contains("osx")) {
+            if (qbs.hostOS.contains("macos")) {
                 return Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductName");
             } else if (qbs.hostOS.contains("windows")) {
                 var productName = Utilities.getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "ProductName");
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index 6ec955caf..3796121cd 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -664,7 +664,7 @@ void TestLanguage::getNativeSetting()
         project = loader->loadProject(defaultParameters);
 
         QString expectedProductName;
-        if (HostOsInfo::isOsxHost())
+        if (HostOsInfo::isMacosHost())
             expectedProductName = QLatin1String("Mac OS X");
         else if (HostOsInfo::isWindowsHost())
             expectedProductName = QLatin1String("Windows");
@@ -1949,7 +1949,7 @@ void TestLanguage::wildcards()
         QVERIFY(product);
         GroupPtr group;
         if (useGroup) {
-            QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 4 : 3);
+            QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 4 : 3);
             foreach (const GroupPtr &rg, product->groups) {
                 if (rg->name == groupName) {
                     group = rg;
@@ -1957,7 +1957,7 @@ void TestLanguage::wildcards()
                 }
             }
         } else {
-            QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 3 : 2);
+            QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 3 : 2);
             group = product->groups.first();
         }
         QVERIFY(group);
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index add6f9cac..fafb278d7 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -93,7 +93,7 @@ QVariantMap certificateInfo(const QByteArray &data)
 
 QVariantMap identitiesProperties()
 {
-    // Apple documentation states that the Sec* family of functions are not thread-safe on OS X
+    // Apple documentation states that the Sec* family of functions are not thread-safe on macOS
     // https://developer.apple.com/library/mac/documentation/Security/Reference/certifkeytrustservices/
     static QMutex securityMutex;
     QMutexLocker locker(&securityMutex);
diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h
index 892f3f1bd..3786a4178 100644
--- a/src/lib/corelib/tools/hostosinfo.h
+++ b/src/lib/corelib/tools/hostosinfo.h
@@ -61,7 +61,7 @@ class QBS_EXPORT HostOsInfo // Exported for use by command-line tools.
 {
 public:
     // Add more as needed.
-    enum HostOs { HostOsWindows, HostOsLinux, HostOsOsx, HostOsOtherUnix, HostOsOther };
+    enum HostOs { HostOsWindows, HostOsLinux, HostOsMacos, HostOsOtherUnix, HostOsOther };
 
     static inline HostOs hostOs();
 
@@ -75,7 +75,7 @@ public:
                              QLatin1Char('.') +
                              settings.value(QStringLiteral("CurrentBuildNumber")).toString());
             Q_ASSERT(v.isValid());
-        } else if (HostOsInfo::isOsxHost()) {
+        } else if (HostOsInfo::isMacosHost()) {
             QSettings settings(QStringLiteral("/System/Library/CoreServices/SystemVersion.plist"),
                                QSettings::NativeFormat);
             v = v.fromString(settings.value(QStringLiteral("ProductVersion")).toString());
@@ -86,7 +86,7 @@ public:
 
     static bool isWindowsHost() { return hostOs() == HostOsWindows; }
     static bool isLinuxHost() { return hostOs() == HostOsLinux; }
-    static bool isOsxHost() { return hostOs() == HostOsOsx; }
+    static bool isMacosHost() { return hostOs() == HostOsMacos; }
     static inline bool isAnyUnixHost();
     static inline QString rfc1034Identifier(const QString &str);
 
@@ -113,7 +113,7 @@ public:
     {
         if (isWindowsHost())
             return QStringLiteral("PATH");
-        if (isOsxHost())
+        if (isMacosHost())
             return QStringLiteral("DYLD_LIBRARY_PATH");
         return QStringLiteral("LD_LIBRARY_PATH");
     }
@@ -125,7 +125,7 @@ public:
 
     static Qt::KeyboardModifier controlModifier()
     {
-        return isOsxHost() ? Qt::MetaModifier : Qt::ControlModifier;
+        return isMacosHost() ? Qt::MetaModifier : Qt::ControlModifier;
     }
 };
 
@@ -136,7 +136,7 @@ HostOsInfo::HostOs HostOsInfo::hostOs()
 #elif defined(Q_OS_LINUX)
     return HostOsLinux;
 #elif defined(Q_OS_DARWIN)
-    return HostOsOsx;
+    return HostOsMacos;
 #elif defined(Q_OS_UNIX)
     return HostOsOtherUnix;
 #else
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index 7341fea7c..3bd0609df 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -70,7 +70,7 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log
 
     if (HostOsInfo::isWindowsHost())
         filters << QLatin1String("*.dll");
-    else if (HostOsInfo::isOsxHost())
+    else if (HostOsInfo::isMacosHost())
         filters << QLatin1String("*.dylib");
     else
         filters << QLatin1String("*.so");
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
index b40af1089..6a6d6f8a8 100644
--- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp
+++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
@@ -608,7 +608,7 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q
         if (hasV2 && !hasModuleEntry)
             moduleInfo.hasLibrary = false;
 
-        // Fix include paths for OS X and iOS frameworks.
+        // Fix include paths for Apple frameworks.
         // The qt_lib_XXX.pri files contain wrong values for versions < 5.6.
         if (!hasV2 && moduleInfo.isFramework(qtEnvironment)) {
             moduleInfo.includePaths.clear();
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 9f532f093..e6cfec8c9 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -336,7 +336,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
 
     // Set the minimum operating system versions appropriate for this Qt version
     const QString windowsVersion = guessMinimumWindowsVersion(qtEnvironment);
-    QString osxVersion, iosVersion, androidVersion;
+    QString macosVersion, iosVersion, androidVersion;
 
     if (!windowsVersion.isEmpty()) {    // Is target OS Windows?
         const Version qtVersion = Version(qtEnvironment.qtMajorVersion,
@@ -347,7 +347,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
     } else if (qtEnvironment.mkspecPath.contains(QLatin1String("macx"))) {
         profile.setValue(settingsTemplate.arg(QLatin1String("frameworkBuild")), qtEnvironment.frameworkBuild);
         if (qtEnvironment.qtMajorVersion >= 5) {
-            osxVersion = QLatin1String("10.6");
+            macosVersion = QLatin1String("10.6");
         } else if (qtEnvironment.qtMajorVersion == 4 && qtEnvironment.qtMinorVersion >= 6) {
             QDir qconfigDir;
             if (qtEnvironment.frameworkBuild) {
@@ -372,17 +372,17 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
                 } while (!line.isNull());
 
                 if (ts.status() == QTextStream::Ok)
-                    osxVersion = qtCocoaBuild ? QLatin1String("10.5") : QLatin1String("10.4");
+                    macosVersion = qtCocoaBuild ? QLatin1String("10.5") : QLatin1String("10.4");
             }
 
-            if (osxVersion.isEmpty()) {
+            if (macosVersion.isEmpty()) {
                 throw ErrorInfo(Internal::Tr::tr("Error reading qconfig.h; could not determine "
                                                  "whether Qt is using Cocoa or Carbon"));
             }
         }
 
         if (qtEnvironment.qtConfigItems.contains(QLatin1String("c++11")))
-            osxVersion = QLatin1String("10.7");
+            macosVersion = QLatin1String("10.7");
     }
 
     if (qtEnvironment.mkspecPath.contains(QLatin1String("ios")) && qtEnvironment.qtMajorVersion >= 5)
@@ -400,8 +400,8 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
     if (!windowsVersion.isEmpty())
         profile.setValue(QLatin1String("cpp.minimumWindowsVersion"), windowsVersion);
 
-    if (!osxVersion.isEmpty())
-        profile.setValue(QLatin1String("cpp.minimumOsxVersion"), osxVersion);
+    if (!macosVersion.isEmpty())
+        profile.setValue(QLatin1String("cpp.minimumMacosVersion"), macosVersion);
 
     if (!iosVersion.isEmpty())
         profile.setValue(QLatin1String("cpp.minimumIosVersion"), iosVersion);