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>

10 files changed, 23 insertions, 23 deletions

diff --git a/doc/includes/installerfw-examples-generating.qdocinc b/doc/includes/installerfw-examples-generating.qdocinc
index 45ea2fc22..65ef313b5 100644
--- a/doc/includes/installerfw-examples-generating.qdocinc
+++ b/doc/includes/installerfw-examples-generating.qdocinc
@@ -8,7 +8,7 @@
             \code
             ..\..\bin\binarycreator.exe -c config\config.xml -p packages installer.exe
             \endcode
-        \li On Linux or OS X:
+        \li On Linux or macOS:
             \code
             ../../bin/binarycreator -c config/config.xml -p packages installer
             \endcode
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index f3832ddae..7d3300138 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -99,9 +99,9 @@
     make module-qtbase module-qtdeclarative module-qttools module-qttranslations
     \endcode
 
-    \section3 Configuring Qt for OS X
+    \section3 Configuring Qt for macOS
 
-    We recommend that you use the following configuration options for OS X:
+    We recommend that you use the following configuration options for macOS:
 
     \code
     configure -prefix $PWD/qtbase -release -static -no-securetransport -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -no-freetype
diff --git a/doc/installerfw-overview.qdoc b/doc/installerfw-overview.qdoc
index ee93fcf5a..9a5da1943 100644
--- a/doc/installerfw-overview.qdoc
+++ b/doc/installerfw-overview.qdoc
@@ -37,7 +37,7 @@
     create installers once, and deploy them across all the supported desktop
     Qt platforms without rewriting the source code. The installers will have the
     native look and feel on the platform where they are run: Linux, Microsoft
-    Windows, and OS X.
+    Windows, and macOS.
 
     The Qt Installer Framework tools generate installers with a set of pages
     that guide the users during the installation, update, or uninstallation
diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc
index 178957dbd..30065fa56 100644
--- a/doc/installerfw-using.qdoc
+++ b/doc/installerfw-using.qdoc
@@ -71,7 +71,7 @@
 
     \image ifw-user-flow-installing.png "Installation workflow"
 
-    This section uses the \e {Your Application Installer} example run on OS X
+    This section uses the \e {Your Application Installer} example run on macOS
     to illustrate the default workflow for end users. The installers have the
     native look and feel on each supported desktop platform, and therefore they
     look and feel different when run on Linux and Windows.
@@ -188,7 +188,7 @@
     \image ifw-user-flow-adding.png "Add components workflow"
 
     This section uses the \e {Maintenance Tool} installed by the Qt 5 installer
-    run on OS X as an example implementation of how end users can add components
+    run on macOS as an example implementation of how end users can add components
     after the initial installation. The Maintenance Tool contains the package
     manager, updater, and uninstaller.
 
@@ -244,7 +244,7 @@
 
     \image ifw-user-flow-removing.png "Remove components workflow"
 
-    This section uses the Qt 5 Maintenance Tool run on OS X as an example
+    This section uses the Qt 5 Maintenance Tool run on macOS as an example
     implementation of how end users can remove all or selected components.
 
     \section1 Removing All Components
@@ -297,7 +297,7 @@
 
     \image ifw-user-flow-updating.png "Updating workflow"
 
-    This section uses the Qt 5 Maintenance Tool run on OS X as an example
+    This section uses the Qt 5 Maintenance Tool run on macOS as an example
     implementation of how end users can update installed components.
 
     \section1 Starting Updater
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index ec3c3781b..07859b0d9 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -42,7 +42,7 @@
 
     The Qt Installer Framework provides a set of tools and utilities to
     create installers for the supported desktop Qt platforms: Linux, Microsoft
-    Windows, and OS X.
+    Windows, and macOS.
 
     \note Report bugs and suggestions for the Qt Installer Framework project
     in the \l{https://bugreports.qt.io/browse/QTIFW}{Qt Bugtracker}.
@@ -191,13 +191,13 @@
         \row
             \li Icon
             \li Filename for a custom installer icon. The actual file is looked up by attaching
-                a '.icns' (OS X), '.ico' (Windows) or '.png' (Unix) suffix. Deprecated,
+                a '.icns' (macOS), '.ico' (Windows) or '.png' (Unix) suffix. Deprecated,
                 use \c <InstallerApplicationIcon> or \c <InstallerWindowIcon>
                 instead.
         \row
             \li InstallerApplicationIcon
             \li Filename for a custom installer icon. The actual file is looked up by attaching
-                a '.icns' (OS X), '.ico' (Windows). No functionality on Unix.
+                a '.icns' (macOS), '.ico' (Windows). No functionality on Unix.
         \row
             \li InstallerWindowIcon
             \li Filename for a custom window icon in PNG format for the Installer application.
@@ -794,7 +794,7 @@
     <location-of-ifw>\binarycreator.exe -t <location-of-ifw>\installerbase.exe -p <package_directory> -c <config_directory>\<config_file> <installer_name>
     \endcode
 
-        \li On Linux and OS X
+        \li On Linux and macOS
 
     \code
     <location-of-ifw>/binarycreator -t <location-of-ifw>/installerbase -p <package_directory> -c <config_directory>/<config_file> <installer_name>
@@ -812,7 +812,7 @@
     <location-of-ifw>\binarycreator.exe -t <location-of-ifw>\installerbase.exe -p <package_directory> -c <config_directory>\<config_file> -e <packages> <installer_name>
     \endcode
 
-        \li On Linux and OS X
+        \li On Linux and macOS
 
     \code
     <location-of-ifw>/binarycreator -t <location-of-ifw>/installerbase -p <package_directory> -c <config_directory>/<config_file> -e <packages> <installer_name>
@@ -883,7 +883,7 @@
 
         \row
             \li -s or --sign identity
-            \li Only available on OS X. Allows specifying a code signing identity to be
+            \li Only available on macOS. Allows specifying a code signing identity to be
                 used for signing the generated app bundle.
     \endtable
 
@@ -907,7 +907,7 @@
 
     \section2 Using Icons
 
-    On OS X, if the target binary is suffixed with .app, a OS X
+    On macOS, if the target binary is suffixed with .app, a macOS
     application bundle is created. The icon that you specify in config.xml is
     extended with .icns and used as the icon for the created bundle.
 
diff --git a/doc/scripting-api/buttons.qdoc b/doc/scripting-api/buttons.qdoc
index a96d68434..811bde587 100644
--- a/doc/scripting-api/buttons.qdoc
+++ b/doc/scripting-api/buttons.qdoc
@@ -42,13 +42,13 @@
     Specifies the buttons on an installer page.
 
     \value  buttons.BackButton
-            The \uicontrol Back button (\uicontrol {Go Back} on OS X.)
+            The \uicontrol Back button (\uicontrol {Go Back} on macOS.)
     \value  buttons.NextButton
-            The \uicontrol Next button (\uicontrol Continue on OS X.)
+            The \uicontrol Next button (\uicontrol Continue on macOS.)
     \value  buttons.CommitButton
             The \uicontrol Commit button.
     \value  buttons.FinishButton
-            The \uicontrol Finish button (\uicontrol Done on OS X.)
+            The \uicontrol Finish button (\uicontrol Done on macOS.)
     \value  buttons.CancelButton
             The \uicontrol Cancel button.
     \value  buttons.HelpButton
diff --git a/doc/scripting-api/qfiledialog.qdoc b/doc/scripting-api/qfiledialog.qdoc
index ecce6f59d..5433697ce 100644
--- a/doc/scripting-api/qfiledialog.qdoc
+++ b/doc/scripting-api/qfiledialog.qdoc
@@ -66,6 +66,6 @@
     "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
     \endcode
 
-    On Windows, and OS X, this static function will use the native file dialog
+    On Windows, and macOS, this static function will use the native file dialog
     and not a QFileDialog.
 */
diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc
index 708345c7d..20004e9b7 100644
--- a/doc/scripting.qdoc
+++ b/doc/scripting.qdoc
@@ -265,7 +265,7 @@
             \li Applications directory.
 
                 For example, \c {C:\Program Files} on Windows,
-                \c {/opt} on Linux and \c {/Applications} on OS X.
+                \c {/opt} on Linux and \c {/Applications} on macOS.
 
                 See also the table that lists examples of \l {Applications-directory-on-Windows}
                 {applications directories on Windows}.
diff --git a/doc/systeminfo.qdoc b/doc/systeminfo.qdoc
index fde826066..5e64db484 100644
--- a/doc/systeminfo.qdoc
+++ b/doc/systeminfo.qdoc
@@ -58,7 +58,7 @@
     kernel the installer is running on, unless the host operating system is running a form of
     compatibility or virtualization layer.
 
-    For Windows, Linux, and OS X this will return
+    For Windows, Linux, and macOS this will return
     \list
         \li "winnt"
         \li "linux"
@@ -82,7 +82,7 @@
     \endlist
 
     The release version of the operating system kernel. On Windows, it returns the version of the
-    NT or CE kernel. On Unix systems, including OS X, it returns the same as the \c {uname -r}
+    NT or CE kernel. On Unix systems, including macOS, it returns the same as the \c {uname -r}
     command would return.
 
     \sa QSysInfo::kernelVersion()
diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc
index df53d22a6..0633c94a5 100644
--- a/doc/tutorial.qdoc
+++ b/doc/tutorial.qdoc
@@ -195,7 +195,7 @@
     ..\..\bin\binarycreator.exe -c config\config.xml -p packages YourInstaller.exe
     \endcode
 
-    \li On Linux or OS X:
+    \li On Linux or macOS:
     \code
     ../../bin/binarycreator -c config/config.xml -p packages YourInstaller
     \endcode