Doc: Change instances of 'OS X' to 'macOS'

As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the Mac platform
is discussed to use the macro \macos (defined in the documentation
configuration in qtbase), except within \code blocks in QDoc manual,
where macros are not expanded.

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

4 files changed, 9 insertions, 9 deletions

diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc
index b23967916..ac3b38995 100644
--- a/examples/assistant/doc/src/simpletextviewer.qdoc
+++ b/examples/assistant/doc/src/simpletextviewer.qdoc
@@ -330,7 +330,7 @@
     To start the process we need the executable name of \QA as well as the
     command line arguments for running \QA in a customized mode. The
     executable name is a little bit tricky since it depends on the
-    platform, but fortunately it is only different on OS X.
+    platform, but fortunately it is only different on \macos.
 
     The displayed documentation can be altered using the \c -collectionFile
     command line argument when launching \QA. When started without any options,
diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc
index 2b99a0aba..e318229c8 100644
--- a/src/designer/src/designer/doc/src/designer-manual.qdoc
+++ b/src/designer/src/designer/doc/src/designer-manual.qdoc
@@ -800,7 +800,7 @@
     \table
         \header
             \li  Windows XP
-            \li  OS X
+            \li  \macos
             \li  Cleanlooks
         \row
             \li  \inlineimage designer-form-layout-windowsXP.png
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
index e1eab02fb..2a54c417e 100644
--- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -2187,7 +2187,7 @@
         \image happyguy.jpg "Happy guy"
 
         Qt provides single-source portability across Microsoft
-        Windows, OS X, Linux, and all major commercial Unix
+        Windows, macOS, Linux, and all major commercial Unix
         variants. It is also available for embedded devices.
     * /
     \endcode
@@ -2200,7 +2200,7 @@
         \image happyguy.jpg image "Happy guy"
 
         Qt provides single-source portability across Microsoft
-        Windows, OS X, Linux, and all major commercial Unix
+        Windows, macOS, Linux, and all major commercial Unix
         variants. It is also available for embedded devices.
         \endquotation
 
@@ -3291,7 +3291,7 @@
            / *!
                Qt::HANDLE is a platform-specific handle type
                for system objects. This is  equivalent to
-               \c{void *} on Windows and OS X, and to
+               \c{void *} on Windows and macOS, and to
                \c{unsigned long} on X11.
 
                \warning Using this type is not portable.
@@ -3303,7 +3303,7 @@
            \quotation
                Qt::HANDLE is a platform-specific handle type
                for system objects. This is  equivalent to
-               \c{void *} on Windows and OS X, and to
+               \c{void *} on Windows and macOS, and to
                \c{unsigned long} on X11.
 
                \warning Using this type is not portable.
@@ -3864,7 +3864,7 @@
         \ingroup basicwidgets
 
         \meta {technology} {User Interface}
-        \meta {platform} {OS X 10.6}
+        \meta {platform} {macOS 10.6}
         \meta {platform} {Symbian}
         \meta {platform} {MeeGo}
         \meta {audience} {user}
@@ -3906,7 +3906,7 @@
                </prodinfo>
                <othermeta name="platform" content="MeeGo"/>
                <othermeta name="platform" content="Symbian"/>
-               <othermeta name="platform" content="OS X 10.6"/>
+               <othermeta name="platform" content="macOS 10.6"/>
                <othermeta name="technology" content="User Interface"/>
            </metadata>
        </prolog>
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 2535fd534..92fe47e05 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -950,7 +950,7 @@
 
                Qt is a C++ toolkit for cross-platform GUI
                application development. Qt provides single-source
-               portability across Microsoft Windows, OS X, Linux,
+               portability across Microsoft Windows, macOS, Linux,
                and all major commercial Unix variants.
 
                Qt provides application developers with all the