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>

28 files changed, 83 insertions, 82 deletions

diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc
index 8813a3d579..8b70832e24 100644
--- a/doc/api/qtcreator-documentation.qdoc
+++ b/doc/api/qtcreator-documentation.qdoc
@@ -156,7 +156,7 @@
 
     \section2 Taking Screen Shots
 
-    \QC has the native look and feel on Windows, Linux, and OS X, and therefore,
+    \QC has the native look and feel on Windows, Linux, and \macos, and therefore,
     screen shots can end up looking very different, depending on who takes them
     and which system they use. To try to preserve a consistent look and feel in
     the \QC Manual, observe the guidelines listed in this section when taking
@@ -207,7 +207,7 @@
     You can use a web service, such as \l{https://tinypng.com}, or an image
     optimization tool to shrink the images. For example, you can use the Radical
     Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on
-    OS X (much less efficient), or some other tool available on Linux.
+    \macos (much less efficient), or some other tool available on Linux.
 
     With ImageOptim, you simply drag and drop the image files to the
     application. The following section describes the settings to use for RIOT.
@@ -278,7 +278,7 @@
     \list
         \li  nmake docs (on Windows)
 
-        \li  make docs (on Linux and OS X)
+        \li  make docs (on Linux and \macos)
     \endlist
 
     The \QC Manual HTML files are generated in the \c {doc/html} directory.
@@ -286,7 +286,7 @@
     \c {doc/html-dev} directory. The help files (\c {.qch}) are generated in the
     \c {share/doc/qtcreator} directory in the \QC build directory on Windows and
     Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
-    on OS X. You can view the HTML files in a browser and the help files in
+    on \macos. You can view the HTML files in a browser and the help files in
     the \QC \uicontrol Help mode. For more information about adding the help
     files to \QC, see
     \l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation}
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
index 0fc6155887..3bc993963e 100644
--- a/doc/config/macros.qdocconf
+++ b/doc/config/macros.qdocconf
@@ -12,6 +12,7 @@ macro.hr.HTML           = "<hr />"
 macro.iacute.HTML       = "&iacute;"
 macro.key               = "\\b"
 macro.menu              = "\\b"
+macro.macos             = "macOS"
 macro.note              = "\\b{Note:}"
 macro.oslash.HTML       = "&oslash;"
 macro.ouml.HTML         = "&ouml;"
diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc
index 79242eef91..d7bc879964 100644
--- a/doc/src/analyze/creator-valgrind-overview.qdoc
+++ b/doc/src/analyze/creator-valgrind-overview.qdoc
@@ -47,7 +47,7 @@
     for which you set up a project in \QC and applications for which you do not
     have a project.
 
-    Valgrind tools are supported locally only on Linux and OS X. However,
+    Valgrind tools are supported locally only on Linux and \macos. However,
     according to Valgrind.org, support on OS X 10.8 and 10.9 is experimental and
     mostly broken. You can run the tools on a remote Linux machine or device
     from any development host.
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index cd567cba35..8887ea5ceb 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -64,7 +64,7 @@
     the Symbol Server provided by Microsoft to the symbol search path of the
     debugger. For more information, see \l{Setting CDB Paths on Windows}.
 
-    \note To use the Free Software Foundation (FSF) version of GDB on OS X, you
+    \note To use the Free Software Foundation (FSF) version of GDB on \macos, you
     must sign it and modify your \l{glossary-buildandrun-kit}{kit} settings.
 
     This section explains the options you have for debugging C++ code and
@@ -79,7 +79,7 @@
     Qt Creator supports native debuggers when working with compiled code. On
     most supported platforms, the GNU Symbolic Debugger GDB can be used. On
     Microsoft Windows, when using the Microsoft tool chain the Microsoft Console
-    Debugger CDB, is needed. On OS X, the LLDB debugger can be used. Basic
+    Debugger CDB, is needed. On \macos, the LLDB debugger can be used. Basic
     support for LLDB is also available on Linux, but it is restricted by LLDB's
     capabilities there, and considered experimental.
 
@@ -99,7 +99,7 @@
             \li GCC, ICC
             \li GDB
         \row
-            \li OS X
+            \li \macos
             \li GCC, Clang
             \li LLDB, FSF GDB (experimental)
         \row
@@ -130,11 +130,11 @@
     \section2 Supported LLDB Versions
 
     The LLDB native debugger has similar functionality to the GDB debugger. LLDB
-    is the default debugger in Xcode on OS X for supporting C++ on the desktop.
+    is the default debugger in Xcode on \macos for supporting C++ on the desktop.
     LLDB is typically used with the Clang compiler (even though you can use it
     with GCC, too).
 
-    On OS X you can use the LLDB version delivered with Xcode or build from source.
+    On \macos you can use the LLDB version delivered with Xcode or build from source.
     The minimum supported version is LLDB 320.4.
 
     On Linux, the minimum supported version is LLDB 3.8.
@@ -184,7 +184,7 @@
                 most Linux distributions the GDB builds shipped with the system
                 are sufficient. You can also build your own. Follow the
                 instructions in \l{http://wiki.qt.io/QtCreator_Build_Gdb}
-                {Building GDB}. Builds of GDB shipped with Xcode on OS X are no
+                {Building GDB}. Builds of GDB shipped with Xcode on \macos are no
                 longer supported.
 
         \row
@@ -211,7 +211,7 @@
                 \l{Setting CDB Paths on Windows}.
 
        \row
-            \li Debugging tools for OS X
+            \li Debugging tools for \macos
             \li The Qt binary distribution contains both debug and release
                 variants of the libraries. But you have to explicitly tell the
                 runtime linker that you want to use the debug libraries even if
@@ -223,7 +223,7 @@
                 \uicontrol Projects mode. In the run configuration, select
                 \uicontrol{Use debug version of frameworks}.
 
-                For more detailed information about debugging on OS X,
+                For more detailed information about debugging on \macos,
                 see: \l{http://developer.apple.com/library/mac/#technotes/tn2124/_index.html#//apple_ref/doc/uid/DTS10003391}
                 {Mac OS X Debugging Magic}.
 
@@ -282,9 +282,9 @@
     directly from version control or the web, enter the following string in
     the \uicontrol {Source Paths} field: \c srv*.
 
-    \section1 Setting up FSF GDB for OS X
+    \section1 Setting up FSF GDB for \macos
 
-    To use FSF GDB on OS X, you must sign it and add it to the \QC
+    To use FSF GDB on \macos, you must sign it and add it to the \QC
     \l{glossary-buildandrun-kit}{kits}.
 
     \list 1
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 7e8821ae4e..606405a35e 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -448,18 +448,18 @@
        \li To finish debugging, press \key {Shift+F5}.
 
        \li To execute a line of code as a whole, press \key F10
-           (\key {Command+Shift+O} on OS X).
+           (\key {Command+Shift+O} on \macos).
 
        \li To step into a function or a subfunction, press \key F11
-           (\key {Command+Shift+I} on OS X).
+           (\key {Command+Shift+I} on \macos).
 
        \li To leave the current function or subfunction, press \key {Shift+F11}
-           (\key {Command+Shift+T} on OS X).
+           (\key {Command+Shift+T} on \macos).
 
        \li To continue running the program, press \key F5.
 
        \li To run to the line containing the cursor, press \key {Ctrl+F10}
-           (\key {Shift+F8} on OS X).
+           (\key {Shift+F8} on \macos).
 
        \li To run to the selected function when you are stepping into a nested
            function, press \key {Ctrl+F6}.
@@ -521,7 +521,7 @@
             \list
 
                 \li In the code editor, click the left margin or press \key F9
-                    (\key F8 for OS X) at a particular line you want the
+                    (\key F8 for \macos) at a particular line you want the
                     program to stop.
 
                 \li In the \uicontrol Breakpoints view, double-click in the empty
@@ -685,7 +685,7 @@
 
         \row
             \li GDB and LLDB, and therefore \QC's debugger, also work for optimized
-                builds on Linux and OS X. Optimization can lead to re-ordering
+                builds on Linux and \macos. Optimization can lead to re-ordering
                 of instructions or removal of some local variables, causing the
                 \uicontrol {Locals and Expressions} view to show unexpected
                 data.
@@ -780,11 +780,11 @@
 
     For more information, see \l{Using Command Line Options}.
 
-    \section2 Stepping into Frameworks in OS X
+    \section2 Stepping into Frameworks in \macos
 
-    In OS X, external libraries are usually built into so-called Frameworks,
+    In \macos, external libraries are usually built into so-called Frameworks,
     which may contain both release and debug versions of the library. When you
-    run applications on the OS X desktop, the release version of Frameworks is
+    run applications on the \macos desktop, the release version of Frameworks is
     used by default. To step into Frameworks, select the
     \uicontrol {Use debug versions of Frameworks} option in the project run
     settings.
@@ -801,7 +801,7 @@
     The \uicontrol Modules view displays information that the debugger plugin
     has about modules included in the application that is being debugged. A
     module is a dynamic link library (\c {.dll}) in Windows, a shared object
-    (\c {.so}) in Linux, and a dynamic shared library (\c {.dylib}) in OS X.
+    (\c {.so}) in Linux, and a dynamic shared library (\c {.dylib}) in \macos.
 
     In addition, the view displays symbols within the modules and indicates
     where each module was loaded.
diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc
index 8a82658f86..3dcffd90e1 100644
--- a/doc/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/src/editors/creator-coding-edit-mode.qdoc
@@ -65,7 +65,7 @@
     alphabetic order.
 
     To jump to a line and column in the current file, select the line and column
-    indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on OS X) to open the
+    indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on \macos) to open the
     locator. Enter the line number and column number in the locator, separated
     by a colon (:).
 
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 4cd1173e41..35017f9122 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -193,7 +193,7 @@
     schemas. \QC looks for a JSON schema file with a
     name that matches the name of the JSON instance file in the user
     configuration folder. For example, \c {~/config/QtProject/qtcreator/json} on
-    Linux and OS X and
+    Linux and \macos and
     \c {C:\Users\username\AppData\Roaming\QtCreator\qtcreator\json}
     in Windows. To check JSON data structure, copy the JSON schema file to the
     above folder.
@@ -2462,7 +2462,7 @@
 
     \list
 
-        \li Press \key {Ctrl+K} (\key {Cmd+K} on OS X).
+        \li Press \key {Ctrl+K} (\key {Cmd+K} on \macos).
 
         \li Select \uicontrol Tools > \uicontrol Locate.
 
diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc
index 11dffd9514..2d900dd8bb 100644
--- a/doc/src/howto/creator-cli.qdoc
+++ b/doc/src/howto/creator-cli.qdoc
@@ -61,7 +61,7 @@
 
     \endlist
 
-    On OS X:
+    On \macos:
 
     \list
 
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc
index 4e680f6e93..060c5df15e 100644
--- a/doc/src/howto/creator-external-tools.qdoc
+++ b/doc/src/howto/creator-external-tools.qdoc
@@ -81,7 +81,7 @@
     \section1 Using External Text Editors
 
     You can open files for editing in the default text editor for your system:
-    Notepad on Windows and vi on Linux and OS X.
+    Notepad on Windows and vi on Linux and \macos.
     To open the file you are currently viewing in an external editor, select
     \uicontrol Tools > \uicontrol External > \uicontrol Text >
     \uicontrol {Edit with Notepad} or \uicontrol {Edit with vi}, depending on
@@ -157,7 +157,7 @@
     The tool configurations that you add and modify are stored in XML format in
     the user configuration folder. For example,
     \c {~/config/QtProject/qtcreator/externaltools}
-    on Linux and OS X and
+    on Linux and \macos and
     \c {C:\Users\username\AppData\Roaming\QtProject\qtcreator\externaltools}
     in Windows. To share a configuration with other users, copy an XML
     configuration file to the folder.
diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc
index a2cd709ee4..1db06941ff 100644
--- a/doc/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc
@@ -200,19 +200,19 @@
             \li  Ctrl+6
         \row
             \li  Toggle \uicontrol{Issues} pane
-            \li  Alt+1 (Cmd+1 on OS X)
+            \li  Alt+1 (Cmd+1 on \macos)
         \row
             \li  Toggle \uicontrol{Search Results} pane
-            \li  Alt+2 (Cmd+2 on OS X)
+            \li  Alt+2 (Cmd+2 on \macos)
         \row
             \li  Toggle \uicontrol{Application Output} pane
-            \li  Alt+3 (Cmd+3 on OS X)
+            \li  Alt+3 (Cmd+3 on \macos)
         \row
             \li  Toggle \uicontrol{Compile Output} pane
-            \li  Alt+4 (Cmd+4 on OS X)
+            \li  Alt+4 (Cmd+4 on \macos)
         \row
             \li  Toggle other output panes
-            \li  Alt+number (Cmd+number on OS X)
+            \li  Alt+number (Cmd+number on \macos)
 
             Where the number is the number of the output pane.
         \row
@@ -241,7 +241,7 @@
             \li  Ctrl+Shift+F11
         \row
             \li  Toggle the sidebar
-            \li  Alt+0 (Cmd+0 on OS X)
+            \li  Alt+0 (Cmd+0 on \macos)
         \row
             \li  Undo
             \li  Ctrl+Z
diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc
index 7210869836..10a67f912e 100644
--- a/doc/src/howto/creator-tips.qdoc
+++ b/doc/src/howto/creator-tips.qdoc
@@ -61,8 +61,8 @@
     \key Ctrl+Tab.
 
     To move forward in the location history, press \key {Alt+Right}
-    (\key {Cmd+Opt+Right} on OS X). To move backward, press \key {Alt+Left}
-    (\key {Cmd+Opt+Left} on OS X). For example, if you use the \uicontrol Locator
+    (\key {Cmd+Opt+Right} on \macos). To move backward, press \key {Alt+Left}
+    (\key {Cmd+Opt+Left} on \macos). For example, if you use the \uicontrol Locator
     to jump to a symbol in the same file, you can jump back to your original
     location in that file by pressing \key {Alt+Left}.
 
@@ -96,13 +96,13 @@
 
     \list
 
-        \li \uicontrol{Issues} pane Alt+1 (Cmd+1 on OS X)
+        \li \uicontrol{Issues} pane Alt+1 (Cmd+1 on \macos)
 
-        \li \uicontrol{Search Results} pane Alt+2 (Cmd+2 on OS X)
+        \li \uicontrol{Search Results} pane Alt+2 (Cmd+2 on \macos)
 
-        \li \uicontrol{Application Output} pane Alt+3 (Cmd+3 on OS X)
+        \li \uicontrol{Application Output} pane Alt+3 (Cmd+3 on \macos)
 
-        \li \uicontrol{Compile Output} pane Alt+4 (Cmd+4 on OS X)
+        \li \uicontrol{Compile Output} pane Alt+4 (Cmd+4 on \macos)
 
     \endlist
 
@@ -136,7 +136,7 @@
 
     To toggle the sidebar in the \uicontrol Edit and \uicontrol Debug modes, click
     \inlineimage sidebaricon.png
-    or press \key Alt+0 (\key Cmd+0 on OS X).
+    or press \key Alt+0 (\key Cmd+0 on \macos).
 
     For more information on using the sidebar, see
     \l {Browsing Project Contents}.
@@ -152,7 +152,7 @@
     select the symbol in the list. For more information on using the locator,
     see \l{Searching with the Locator}.
 
-    Press \key Ctrl (\key Cmd on OS X) and click a symbol to move directly to
+    Press \key Ctrl (\key Cmd on \macos) and click a symbol to move directly to
     the definition or the declaration of the symbol. You can also move the
     cursor on the symbol and press \key {F2}. For more information, see
     \l{Moving to Symbol Definition or Declaration}.
diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc
index 6b1e038333..46d234e32b 100644
--- a/doc/src/howto/creator-ui.qdoc
+++ b/doc/src/howto/creator-ui.qdoc
@@ -157,7 +157,7 @@
 
         \li To toggle the sidebar, click \inlineimage sidebaricon.png
             (\uicontrol {Hide Sidebar/Show Sidebar}) or press \key Alt+0
-            (\key Cmd+0 on OS X).
+            (\key Cmd+0 on \macos).
 
         \li To split the sidebar, click \inlineimage splitbutton_horizontal.png
             (\uicontrol {Split}). Select new content to view in the split view.
@@ -574,7 +574,7 @@
     \e options or \e preferences. In this manual, the names and locations on
     Windows and Linux are usually used to keep the instructions short. Here are
     some places to check if you cannot find a function, dialog, or keyboard
-    shortcut on OS X when following the instructions:
+    shortcut on \macos when following the instructions:
 
     \table
         \header
diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc
index 0967170356..78830adc94 100644
--- a/doc/src/howto/creator-vcs.qdoc
+++ b/doc/src/howto/creator-vcs.qdoc
@@ -668,7 +668,7 @@
     To start a graphical interface to Git, select \uicontrol Tools > \uicontrol Git >
     \uicontrol {Git Tools} > \uicontrol {Git Gui}.
 
-    \note On OS X, the default Git installation does not contain Git Gui. To
+    \note On \macos, the default Git installation does not contain Git Gui. To
     use Git Gui, install it separately. To start Git Gui from \QC, select
     \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Git, and set the path to
     the environment that contains Git Gui in the \uicontrol {Prepend to PATH} field.
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 75824c9fde..75d93175e0 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -129,7 +129,7 @@
     The location depends on the platform. On Linux and other Unix platforms, the files
     are located in \c {~/.config/QtProject} and \c {~/.local/share/data/QtProject/qtcreator}.
 
-    On OS X, the files are located in \c {~/.config/QtProject} and
+    On \macos, the files are located in \c {~/.config/QtProject} and
     \c {~/Library/Application Support/QtProject/Qt Creator}.
 
     On Windows XP, the files are located in
@@ -152,7 +152,7 @@
     for the application. Many plugins specify either the path to the tool they
     need or the environment they run in.
 
-    This is especially relevant for the OS X where \c {/usr/local/bin} might
+    This is especially relevant for the \macos where \c {/usr/local/bin} might
     not be in the path when \QC is started.
 
     \b {How do I change the interface language for \QC?}
@@ -193,7 +193,7 @@
     \b {If I have a choice of GDB versions, which should I use?}
 
     On Linux and Windows, use the Python-enabled GDB versions that are
-    installed when you install \QC and \QSDK. On OS X, GDB is no longer
+    installed when you install \QC and \QSDK. On \macos, GDB is no longer
     officially supported. To build your own Python-enabled GDB, follow the
     instructions in
     \l{https://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}.
@@ -218,7 +218,7 @@
 
     \b {How can I make use of my multi-core CPU with \QC?}
 
-    On Linux and OS X, go to \uicontrol Project mode, select your configuration
+    On Linux and \macos, go to \uicontrol Project mode, select your configuration
     in the \uicontrol {Build Settings}, locate the \uicontrol {Build Steps}, and add the
     following value, where \c{<num>} is the amount of cores in your CPU:
     \c{-j <num>}
@@ -259,7 +259,7 @@
 
     \b {Where is application output shown in \QC?}
 
-    \b {On Unix (Linux and OS X):} \c qDebug() and related functions use
+    \b {On Unix (Linux and \macos):} \c qDebug() and related functions use
     the standard output and error output. When you run or debug the
     application, you can view the output in the \uicontrol{Application Output} pane.
 
diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/src/ios/creator-ios-dev.qdoc
index 1277a1ebdc..423e4efa7d 100644
--- a/doc/src/ios/creator-ios-dev.qdoc
+++ b/doc/src/ios/creator-ios-dev.qdoc
@@ -35,7 +35,7 @@
     You can connect iOS devices to a Mac computer with a USB cable to
     build and run applications on them from \QC.
 
-    To be able to use \QC on OS X, you must install Xcode, and therefore,
+    To be able to use \QC on \macos, you must install Xcode, and therefore,
     you already have the tool chain for building applications for iOS. \QC
     automatically detects the tool chain and creates the necessary
     \l{glossary-buildandrun-kit}{kits} for building and running applications on
diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-supported-platforms.qdoc
index a67d8b7405..3cd467b5b3 100644
--- a/doc/src/overview/creator-supported-platforms.qdoc
+++ b/doc/src/overview/creator-supported-platforms.qdoc
@@ -113,7 +113,7 @@
 
             \list
 
-                \li Xcode tools for your OS X version available on the
+                \li Xcode tools for your \macos version available on the
                     Mac App Store.
 
             \endlist
diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc
index 812564c93e..13d3a789e1 100644
--- a/doc/src/overview/creator-target-platforms.qdocinc
+++ b/doc/src/overview/creator-target-platforms.qdocinc
@@ -43,7 +43,7 @@
             \li {3,1} Development Platform
         \header
             \li Linux
-            \li OS X
+            \li \macos
             \li Windows
 
         \row
diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc
index 6ec2d3f723..525c10eb38 100644
--- a/doc/src/projects/creator-projects-cmake.qdoc
+++ b/doc/src/projects/creator-projects-cmake.qdoc
@@ -105,7 +105,7 @@
 
         \li In the \uicontrol {Create in} field, enter the path for the project
             files, and then select \uicontrol Next (or \uicontrol Continue on
-            OS X).
+            \macos).
 
         \li In the \uicontrol {Build system} field, select \uicontrol CMake, and
             then select \uicontrol Next.
@@ -114,7 +114,7 @@
             application for, and then select \uicontrol Next.
 
         \li Review the project settings, and click \uicontrol{Finish} (or
-            \uicontrol Done on OS X).
+            \uicontrol Done on \macos).
 
         \li Select \uicontrol {Run CMake} to generate a .cbp file.
 
@@ -170,7 +170,7 @@
     \section1 Building CMake Projects
 
     To build CMake projects, select \uicontrol {Build Project} or press
-    \key Ctrl+B (or \key Cmd+B on OS X).
+    \key Ctrl+B (or \key Cmd+B on \macos).
 
     \QC builds CMake projects by running \c make, \c mingw32-make, \c nmake, or
     \c ninja depending on the selected kit.
@@ -217,7 +217,7 @@
     \image qtcreator-cmake-run-settings.png
 
     To run CMake projects, select \uicontrol Run or press \key Ctrl+R (or
-    \key Cmd+R on OS X).
+    \key Cmd+R on \macos).
 
     \section1 Deploying CMake Projects to Embedded Linux Devices
 
diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc
index d70815fc65..b4ca89d266 100644
--- a/doc/src/projects/creator-projects-compilers.qdoc
+++ b/doc/src/projects/creator-projects-compilers.qdoc
@@ -51,7 +51,7 @@
     \list
 
         \li GNU Compiler Collection (GCC) is a compiler for Linux and
-            OS X.
+            \macos.
 
         \li MinGW (Minimalist GNU for Windows) is a native software port of GCC
             and GNU Binutils for use in the development of native Microsoft
@@ -62,7 +62,7 @@
             for Linux.
 
         \li Clang is a C, C++, Objective C, and Objective C++ front-end for the
-            LLVM compiler for Windows, Linux, and OS X.
+            LLVM compiler for Windows, Linux, and \macos.
 
         \li QCC is the interface for compiling C++ applications for QNX.
 
diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc
index 1b56471db4..3010f7be19 100644
--- a/doc/src/projects/creator-projects-custom-wizards.qdoc
+++ b/doc/src/projects/creator-projects-custom-wizards.qdoc
@@ -77,7 +77,7 @@
 
         \li the local user's configuration folder,
             \c {$HOME/.config/QtProject/qtcreator/templates/wizards} on Linux
-            and OS X or \c {%APPDATA%\QtProject\qtcreator\templates\wizards} on
+            and \macos or \c {%APPDATA%\QtProject\qtcreator\templates\wizards} on
             Windows
 
     \endlist
diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc
index aa673c0ce5..115e58fed1 100644
--- a/doc/src/projects/creator-projects-libraries.qdoc
+++ b/doc/src/projects/creator-projects-libraries.qdoc
@@ -63,10 +63,10 @@
     (PRE_TARGETDEPS) in the project file.
 
     Depending on the development platform, some options might be detected
-    automatically. For example, on OS X, the library type (\uicontrol Library or
+    automatically. For example, on \macos, the library type (\uicontrol Library or
     \uicontrol Framework) is detected automatically and the option is hidden. However,
-    if you develop on another platform than OS X and want to build your
-    project for OS X, you must specify the library type.
+    if you develop on another platform than \macos and want to build your
+    project for \macos, you must specify the library type.
 
     The default convention on Windows is that the debug and release versions
     of a library have the same name, but are placed in different subdirectories,
diff --git a/doc/src/projects/creator-projects-settings-run-desktop.qdocinc b/doc/src/projects/creator-projects-settings-run-desktop.qdocinc
index 9c8603024e..4b873fae34 100644
--- a/doc/src/projects/creator-projects-settings-run-desktop.qdocinc
+++ b/doc/src/projects/creator-projects-settings-run-desktop.qdocinc
@@ -19,7 +19,7 @@
     you use deployment steps.
 
     The \uicontrol {Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)} option
-    (only available on OS X) enables you to debug (for example, step into)
+    (only available on \macos) enables you to debug (for example, step into)
     linked frameworks, such as the Qt framework itself. You do not need this
     option for debugging your application code.
 
diff --git a/doc/src/qnx/creator-projects-running-qnx.qdocinc b/doc/src/qnx/creator-projects-running-qnx.qdocinc
index 5b99ac9497..5f4ce15cb1 100644
--- a/doc/src/qnx/creator-projects-running-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-running-qnx.qdocinc
@@ -16,7 +16,7 @@
     \QC uses the compiler specified in the QNX tool chain to build the
     application.
 
-    \note Debugging is currently only fully supported on Linux and OS X.
+    \note Debugging is currently only fully supported on Linux and \macos.
     It is not possible to insert breakpoints during runtime on Windows.
 
     \section2 Troubleshooting Errors
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index c23476a376..5cd8d5175a 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -41,7 +41,7 @@
     (IDE) for application developers to create applications for multiple
     desktop, \l {http://doc.qt.io/QtForDeviceCreation/index.html}{embedded},
     and mobile device platforms, such as \l{Connecting Android Devices}{Android}
-    and \l{Connecting iOS Devices}{iOS}. It is available for Linux, OS X and
+    and \l{Connecting iOS Devices}{iOS}. It is available for Linux, \macos and
     Windows
     operating systems. For more information, see \l{Supported Platforms}.
 
diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
index 66ae6e6b74..dba2fde2ad 100644
--- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
+++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
@@ -10,7 +10,7 @@
 
         \li In the \uicontrol {Create in} field, enter the path for the project
             files, and then select \uicontrol Next (or \uicontrol Continue on
-            OS X).
+            \macos).
 
         \li In the \uicontrol {Minimal required Qt version} field, select
             \uicontrol {Qt 5.4}, or later.
@@ -30,12 +30,12 @@
             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).
+            (on \macos).
 
         \li Select \uicontrol Next.
 
         \li Review the project settings, and click \uicontrol{Finish} (or
-            \uicontrol Done on OS X).
+            \uicontrol Done on \macos).
 
     \endlist
 
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 7b1e09a09c..66cea7817e 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -115,7 +115,7 @@
             \uicontrol Kits.
 
         \li Review the project settings, and click \uicontrol Finish (on Windows
-            and Linux) or \uicontrol Done (on OS X) to create the project.
+            and Linux) or \uicontrol Done (on \macos) to create the project.
 
     \endlist
 
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