Doc: Introduce a macro \macos to adapt to upcoming renamings

Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.

Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

2 files changed, 9 insertions, 9 deletions

diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index d0fc38bb93..12315e7009 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -61,7 +61,7 @@
 
         \li In the \uicontrol {Create in} field, enter the path for the project files.
             For example, \c {C:\Qt\examples}, and then click \uicontrol{Next} (on
-            Windows and Linux) or \uicontrol Continue (on OS X).
+            Windows and Linux) or \uicontrol Continue (on \macos).
 
             The \uicontrol {Kit Selection} dialog opens.
 
@@ -73,7 +73,7 @@
             \note If only one kit is specified in \uicontrol Tools > \uicontrol Options >
             \uicontrol {Build & Run} > \uicontrol Kits (on Windows and Linux) or in
             \uicontrol {Qt Creator} > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits
-            (on OS X), this dialog is skipped.
+            (on \macos), this dialog is skipped.
 
             The \uicontrol{Class Information} dialog opens.
 
@@ -95,7 +95,7 @@
             \image qtcreator-new-project-summary-qt-gui.png "Project Management dialog"
 
         \li Review the project settings, and click \uicontrol{Finish} (on Windows and
-            Linux) or \uicontrol Done (on OS X) to create the project.
+            Linux) or \uicontrol Done (on \macos) to create the project.
 
     \endlist
 
@@ -164,7 +164,7 @@
 
         \li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
             click \uicontrol{Lay out Horizontally} (or press \uicontrol{Ctrl+H} on Linux or
-            Windows or \key {Ctrl+Shift+H} on OS X) to apply a horizontal
+            Windows or \key {Ctrl+Shift+H} on \macos) to apply a horizontal
             layout (QHBoxLayout).
 
             \image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout"
diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc
index 103d5f9755..32a0098508 100644
--- a/doc/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/src/widgets/qtdesigner-plugins.qdoc
@@ -59,8 +59,8 @@
 
     The integrated \QD fetches plugins from the \c {\bin\plugins\designer}
     directory in the \QC installation directory on Windows and Linux. For
-    information about how to configure plugins on OS X, see
-    \l{Configuring Qt Designer Plugins on OS X}.
+    information about how to configure plugins on \macos, see
+    \l{Configuring Qt Designer Plugins on \macos}.
 
     To check which plugins were loaded successfully and which failed, choose
     \uicontrol Tools > \uicontrol {Form Editor} >
@@ -72,16 +72,16 @@
     of \c bin. To check which plugins were loaded successfully and which failed,
     choose \uicontrol Help > \uicontrol {About Plugins}.
 
-    \section2 Configuring Qt Designer Plugins on OS X
+    \section2 Configuring Qt Designer Plugins on \macos
 
-    On OS X, a GUI application must be built and run from a bundle. A bundle
+    On \macos, a GUI application must be built and run from a bundle. A bundle
     is a directory structure that appears as a single entity when viewed in the
     Finder. A bundle for an application typcially contains the executable and
     all the resources it needs.
 
     \QC uses its own set of Qt Libraries located in the bundle, and therefore,
     you need to configure the \QD plugins that you want to use with \QC.
-    Fore more information about how to deploy applications to OS X, see
+    For more information about how to deploy applications to \macos, see
     \l{Qt for OS X - Deployment}.
 
     The following example illustrates how to configure version 5.2.1 of the