Update usage of Apple-related terminology

Replace deprecated Q_OS_OSX macro used in several places with the newer
Q_OS_MACOS. Old style reference of Apple's desktop operating system name
as "OS X" in documentation and files are also replaced with "macOS"
where applicable.

Task-number: QTIFW-1406
Change-Id: I0561d5e0d964917ac4fca0702d58a06b85d30e57
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/sdk/commandlineparser.cpp b/src/sdk/commandlineparser.cpp
index 80aa0afa8..3d0d2412a 100644
--- a/src/sdk/commandlineparser.cpp
+++ b/src/sdk/commandlineparser.cpp
@@ -51,7 +51,7 @@ CommandLineParser::CommandLineParser()
         QLatin1String("Verbose mode. Prints out more information.")));
 
     m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::Proxy),
-        QLatin1String("Use system proxy on Windows and Linux. This option has no effect on OS X.")));
+        QLatin1String("Use system proxy on Windows and Linux. This option has no effect on macOS.")));
 
     m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::NoProxy),
         QLatin1String("Do not use system proxy.")));
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index 819d512c2..336ff51b0 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -44,7 +44,7 @@
 
 #include <iostream>
 
-#if defined(Q_OS_OSX) or defined(Q_OS_UNIX)
+#if defined(Q_OS_MACOS) or defined(Q_OS_UNIX)
 #  include <unistd.h>
 #  include <sys/types.h>
 #endif
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     }
 #endif
     // increase maximum numbers of file descriptors
-#if defined (Q_OS_OSX)
+#if defined (Q_OS_MACOS)
     QCoreApplication::setSetuidAllowed(true);
     struct rlimit rl;
     getrlimit(RLIMIT_NOFILE, &rl);
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
             Qt::CaseInsensitive) == 0);
         if (production) {
             argumentsValid = (!key.isEmpty()) && (!socketName.isEmpty());
-#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
             /* In production mode detach child so that sudo waiting on us will terminate. */
             pid_t child = fork();
             if (child <= -1) {
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
             return EXIT_FAILURE;
         }
 
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
         // make sure effective == real user id.
         uid_t realUserId = getuid();
         uid_t effectiveUserId = geteuid();
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 17d0ac5e3..68d7a2434 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -73,21 +73,21 @@ public:
         as the binary layout cannot be appended to the actual maintenance tool binary
         itself because of signing.
 
-        On OS X: This function will return always the .dat file
+        On macOS: This function will return always the .dat file
         .dat file is located inside the resource folder in the application
-        bundle in OS X.
+        bundle in macOS.
     */
     QString binaryFile() const
     {
         QString binaryFile = QCoreApplication::applicationFilePath();
 
-        // The installer binary on OSX and Windows does not contain the binary
+        // The installer binary on macOS and Windows does not contain the binary
         // content, it's put into the resources folder as separate file.
         // Adjust the actual binary path. No error checking here since we
         // will fail later while reading the binary content.
         QDir resourcePath(QFileInfo(binaryFile).dir());
 
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
         resourcePath.cdUp();
         resourcePath.cd(QLatin1String("Resources"));
 #endif
@@ -116,7 +116,7 @@ public:
             QString bundlePath;
             if (QInstaller::isInBundle(fi.absoluteFilePath(), &bundlePath))
                 fi.setFile(bundlePath);
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
             return fi.absoluteDir().filePath(fi.baseName() + QLatin1String(".dat"));
 #else
             return fi.absoluteDir().filePath(qApp->applicationName() + QLatin1String(".dat"));