Doc: Change instances of '(Mac) 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).

Also, fix the usage instructions for related Q_OS_* macros.

Change-Id: I5bac6f787a4c434d7ff83036a2cfea4eef41cdc1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

30 files changed, 168 insertions, 159 deletions

diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 5c72e4445..077245d27 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -38,7 +38,7 @@
     should be run from the main Qt source directory.
 
     Unless stated otherwise, the commands in this page are for the Linux
-    platforms. On OS X and on Windows, the \c PATH and directory structure
+    platforms. On \macos and on Windows, the \c PATH and directory structure
     are different, therefore the commands will vary. Also, on Windows systems,
     the configure script is called \e configure.bat.
 
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index 4da7198fc..3a1856656 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -185,7 +185,7 @@ port emulators include virtual COM ports, com0com emulators, and the
 Bluetooth SPP.
 
 This module is designed to make serial port programming easier and portable.
-As of Qt 5.2, it is supported on \l{Qt for Windows}{Windows}, \l{Qt for OS X}{OS X},
+As of Qt 5.2, it is supported on \l{Qt for Windows}{Windows}, \l{Qt for macOS}{\macos},
 and \l{Qt for Linux/X11}{Linux}.
 
 Related topics:
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 9184a47f2..937379063 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -84,7 +84,7 @@ Qt's SQL classes can be divided in 3 layers:
 \endtable
 
 With the MySQL driver, it is possible to connect to a MySQL server. In order to
-build the QMYSQL Plugin for Unix or OS X, you need the MySQL header files
+build the QMYSQL Plugin for Unix or \macos, you need the MySQL header files
 as well as the shared library, libmysqlclient.so. To compile the plugin
 for Windows, install MySQL.
 
@@ -236,7 +236,7 @@ The QSettings class provides persistent storage of application settings.
 An application usually remembers its settings from the previous session.
 
 Settings are stored differently on different platforms. For example,
-on Windows they are stored in the registry, whereas, on OS X they are
+on Windows they are stored in the registry, whereas on \macos they are
 stored in XML files.
 
 QSettings enable you to save and restore application settings in a portable
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 04dab2aaf..f662851ed 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -95,7 +95,7 @@
     platform-specific application dependencies for
     \l{Qt for Linux/X11 - Deployment#Application Dependencies}{X11},
     \l{Qt for Windows - Deployment#Application Dependencies}{Windows},
-    and \l{Qt for OS X}{OS X}.
+    and \l{Qt for macOS}{\macos}.
 
     \section1 Licensing
 
@@ -135,7 +135,7 @@
     \list
         \li \l{Qt for Linux/X11 - Deployment}{Qt for X11 Platforms}
         \li \l{Qt for Windows - Deployment}{Qt for Windows}
-        \li \l{Qt for OS X#Deploying Applications on OS X}{Qt for OS X}
+        \li \l{Qt for macOS#Deploying Applications on macOS}{Qt for macOS}
         \li \l{Deploying an Application on Android}{Qt for Android}
     \endlist
 
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index da532fa52..42ceab951 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -44,7 +44,7 @@
 
     \li \c :/qt/etc/qt.conf using the resource system
 
-    \li on OS X, in the Resource directory inside the application
+    \li on \macos, in the Resource directory inside the application
     bundle, for example \c assistant.app/Contents/Resources/qt.conf
 
     \li in the directory containing the application executable, i.e.
@@ -97,7 +97,7 @@
     Absolute paths are used as specified in the \c qt.conf file. All
     paths are relative to the \c Prefix. On Windows and X11, the \c
     Prefix is relative to the directory containing the application
-    executable (QCoreApplication::applicationDirPath()). On OS X,
+    executable (QCoreApplication::applicationDirPath()). On \macos,
     the \c Prefix is relative to the \c Contents in the application
     bundle. For example, \c application.app/Contents/plugins/ is the
     default location for loading Qt plugins. Note that the plugins
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index 9c415181a..7cbe01036 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -42,7 +42,7 @@
     platforms, building Qt in debug mode will cause applications to be larger
     than desirable.
 
-    \section2 Debugging in OS X and Xcode
+    \section2 Debugging in \macos and Xcode
 
     \section3 Debugging With/Without Frameworks
 
@@ -142,7 +142,7 @@
     \snippet snippets/code/doc_src_debug.cpp 0
 
     The Qt implementation of these macros prints to the
-    \c stderr output under Unix/X11 and OS X. With Windows, if it
+    \c stderr output under Unix/X11 and \macos. With Windows, if it
     is a console application, the text is sent to console; otherwise, it
     is sent to the debugger.
 
diff --git a/doc/src/development/moc.qdoc b/doc/src/development/moc.qdoc
index 6a609c1a2..b6dc6b822 100644
--- a/doc/src/development/moc.qdoc
+++ b/doc/src/development/moc.qdoc
@@ -220,7 +220,7 @@
     \row
     \li \c{-Fdir}
 
-    \li OS X. Add the framework directory \c{dir} to the head of
+    \li \macos. Add the framework directory \c{dir} to the head of
        the list of directories to be searched for header files. These
        directories are interleaved with those specified by -I options
        and are scanned in a left-to-right order (see the manpage for
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index a88a79479..e03e58628 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -299,3 +299,12 @@
     \externalpage http://doc.qt.io/archives/qt-5.3/enginio-index.html
     \title Enginio Manual
 */
+
+/*
+    This prevents autolinking of each occurrence of 'macOS'
+*/
+/*!
+    \externalpage nolink
+    \title macOS
+    \internal
+*/
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index b4e4f7b66..cdbaccbde 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -88,7 +88,7 @@
     Semantic information about user interface elements, such as
     buttons and scroll bars, is exposed to the assistive technologies.
     Qt supports Microsoft Active Accessibility (MSAA) and IAccessible2 on Windows,
-    OS X Accessibility on OS X, and AT-SPI via DBus on Unix/X11.
+    \macos Accessibility on \macos, and AT-SPI via DBus on Unix/X11.
     The platform specific technologies are abstracted by Qt,
     so that applications do not need any platform specific changes to work with the different
     native APIs. Qt tries to make adding accessibility support to your application as easy
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 876669a8e..611a98fae 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -763,7 +763,7 @@
 
     QPainter can be used in a thread to paint onto QImage, QPrinter, and
     QPicture paint devices. Painting onto QPixmaps and QWidgets is \e not
-    supported. On OS X the automatic progress dialog will not be
+    supported. On \macos the automatic progress dialog will not be
     displayed if you are printing from outside the GUI thread.
 
     Any number of threads can paint at any given time, however only
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 0ae1e3eac..b6c15d968 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -77,7 +77,7 @@
     \li \l{Qt for iOS}{iOS}
     \li \l{Qt for Windows}{Windows}
     \li \l{Qt for Linux/X11}{Linux/X11}
-    \li \l{Qt for OS X}{OS X}
+    \li \l{Qt for macOS}{\macos}
     \li \l{Qt for WinRT}{Windows Runtime}
     \li \l{Windows CE - Introduction to using Qt}{WinCE}
     \endlist
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 7ae37aefb..bdfe94a57 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -508,7 +508,7 @@
     the name of the file to open. Qt comes with QFileDialog, which is a dialog
     from which the user can select a file. The appearance of the dialog depends
     on the desktop platform that you run the application on. The following
-    image shows the dialog on OS X:
+    image shows the dialog on \macos:
 
     \image gs4.png
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 69f160ff6..5a0bcd837 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -61,11 +61,11 @@ visit the following page:
 \li \l{Qt for Windows - Building from Source}
 \endlist
 
-\section1 OS X
+\section1 \macos
 
 \list
-\li \l{Qt for OS X - Requirements}
-\li \l{Qt for OS X - Building from Source}
+\li \l{Qt for macOS - Requirements}
+\li \l{Qt for macOS - Building from Source}
 \endlist
 
 \section1 Linux/X11
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index a8713f240..04d09d7a6 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -70,7 +70,7 @@
 
     Qt supports a high DPI mode where the main coordinate system is virtualized and
     made independent of the display pixel density. This mode is implemented by some
-    operating systems (OS X, iOS). In addition, Qt contains an implementation which
+    operating systems (\macos, iOS). In addition, Qt contains an implementation which
     may be used where operating system support is missing.
 
     Geometry is now specified in device independent pixels. This includes widget and
@@ -86,12 +86,12 @@
 
     The operating systems supported by Qt offer the following support for high DPI displays:
 
-    \section3 OS X and iOS
+    \section3 \macos and iOS
 
     The Apple platforms implement scaling and coordinate system virtualization in the
     in the operating system. Normally, no special configuration is required.
 
-    \note On OS X, high-DPI support is enabled by settings in the Info.plist file.
+    \note On \macos, high-DPI support is enabled by settings in the Info.plist file.
     Make sure they are present.
     \code
         <key>NSPrincipalClass</key>
@@ -102,8 +102,8 @@
     Never versions of qmake will generate Info.plist's with the NSPrincipalClass key,
     which is sufficient since NSHighResolutionCapable is true by default.
 
-    \note OS X and iOS may apply further virtualization such that device pixels do not
-    correspond 1:1 to display pixels. This happens on the iPhone 6+ and on OS X configured
+    \note \macos and iOS may apply further virtualization such that device pixels do not
+    correspond 1:1 to display pixels. This happens on the iPhone 6+ and on \macos configured
     with 'display scaling' enabled.
 
     \section3 Microsoft Windows
@@ -160,7 +160,7 @@
             see \l{Drawing High Resolution Versions of Pixmaps and Images}.
 
         \li Qt 5.6 supports cross-platform high-DPI scaling for legacy applications,
-            similar to the scaling done natively by OS X. This allows applications written
+            similar to the scaling done natively by \macos. This allows applications written
             for low-DPI screens to run unchanged on high-DPI devices. This feature is
             opt-in, and can be enabled by the following environment variables:
             \list
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index cea3561b0..a3aec1a64 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -77,7 +77,7 @@
     \c .rc file and run the \c rc or \c windres program on the \c .rc file,
     then link your application with the resulting \c .res file.
 
-    \section1 Setting the Application Icon on OS X
+    \section1 Setting the Application Icon on \macos
 
     The application icon, typically displayed in the application dock
     area, is set by calling QWindow::setWindowIcon() on a window. It is
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index cd823ce9e..db41d9286 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -228,7 +228,7 @@
     evaluating JavaScript expressions comes with a performance cost.
 
     You can use bindings to handle low and high pixel density on platforms that
-    do not have automatic support for it (like OS X and iOS do).
+    do not have automatic support for it (like \macos and iOS do).
     The following code snippet uses the \l{Screen}{Screen.PixelDensity}
     attached property to specify different images to display on screens with
     low, high, or normal pixel density:
@@ -246,7 +246,7 @@
         }
     \endcode
 
-    On OS X and iOS, you can provide alternative resources with double the size
+    On \macos and iOS, you can provide alternative resources with double the size
     and the \e @2x identifier for icons and images and place them in the
     resource file. On Retina displays, the @2x versions are used automatically.
 
@@ -291,9 +291,9 @@
     For more information about high DPI support in Qt and the supported
     platforms, see \l{High DPI Displays}.
 
-    \section2 High DPI Scaling on OS X and iOS
+    \section2 High DPI Scaling on \macos and iOS
 
-    On OS X and iOS, applications use high DPI scaling that is an alternative to
+    On \macos and iOS, applications use high DPI scaling that is an alternative to
     the traditional DPI scaling. In the traditional approach, the application is
     presented with an DPI value used to multiply font sizes, layouts, and so on.
     In the new approach, the operating system provides Qt with a scaling ratio
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index 5d4ab147b..e0b5e0969 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -62,7 +62,7 @@
 
     \section1 Protocols and Support on Different Platforms
 
-    On OS X, and Microsoft Windows versions prior to Windows 2000,
+    On \macos, and Microsoft Windows versions prior to Windows 2000,
     there is nothing like complete session management for applications
     yet, i.e. no restoring of previous sessions. (Windows 2000 and XP
     provide "hibernation" where the entire memory is saved to disk and
@@ -112,7 +112,7 @@
 
     \section1 Testing and Debugging Session Management
 
-    Session management support on OS X and Windows is fairly limited
+    Session management support on \macos and Windows is fairly limited
     due to the lack of this functionality in the operating system
     itself. Simply shut the session down and verify that your application
     behaves as expected. It may be useful to launch another application,
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 30ddfa763..f90fbf450 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -112,7 +112,7 @@
     \li N'Ko
     \endlist
 
-    On OS X, the following languages are also supported:
+    On \macos, the following languages are also supported:
     \list
     \li Oriya
     \li Sinhala
@@ -354,10 +354,10 @@
         the Unicode Standard in the absence of higher-level protocols.
     \endlist
 
-    \section2 OS X
+    \section2 \macos
 
-    For details on OS X-specific translation, refer to the Qt for OS X issues
-    document \l{Qt for OS X - Specific Issues#Translating the Application Menu and Native Dialogs}{here}.
+    For details on \macos-specific translation, refer to the Qt for macOS issues
+    document \l{Qt for macOS - Specific Issues#Translating the Application Menu and Native Dialogs}{here}.
 
     \section1 Related Pages
 */
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 1a45f7eea..17e96ae93 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -90,7 +90,7 @@
          \li Parts of implementation of QSegfaultHandler class. \li BSD-style \li
     \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput(). \li Modified BSD \li
     \row \li \l{Contributions to the Cocoa Platform Plugin Files}{Cocoa Platform Plugin}
-         \li Specific parts of the Qt for OS X Cocoa port. \li BSD-style \li \l{Qt for OS X}
+         \li Specific parts of the Qt for macOS Cocoa port. \li BSD-style \li \l{Qt for macOS}
     \row \li \l{The qtmain Library}{qtmain library}
          \li A helper library for writing a cross-platform main() function on Windows. \li Modified BSD \li \l{Qt for Windows}
     \row \li \l{Shift-JIS Text Codec}
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index 6a0a77be9..44f056cc0 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -63,7 +63,7 @@
 
     \note As \l{Xcode5Req}{required by Apple}, you should always use the latest
     Xcode version when building your applications for the App Store.
-    In practice this means you also need the latest version of OS X to develop
+    In practice this means you also need the latest version of \macos to develop
     iOS apps with Qt, due to Xcode's system requirements.
 
     For running Qt applications in the simulator that comes with Xcode,
@@ -268,7 +268,7 @@
     \section1 Deployment
 
     Developing, building, running, and debugging a Qt for iOS application can all be done
-    with Qt Creator on OS X. The toolchain is provided by Apple's Xcode,
+    with Qt Creator on \macos. The toolchain is provided by Apple's Xcode,
     and running qmake on a project targeted for iOS will also generate an
     Xcode project file (.xcodeproj), with initial application settings. As Qt
     Creator does not provide an interface for managing all of the settings specific
@@ -279,7 +279,7 @@
     \target Info.plist
     \section2 Information Property List Files
 
-    Information property list file (Info.plist) on iOS and OS X is used for configuring
+    Information property list file (Info.plist) on iOS and \macos is used for configuring
     an application bundle. These configuration settings include:
 
     \list
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index 678e4dac8..4bd0f9664 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -27,15 +27,17 @@
 
 /*!
     \page osx.html
-    \title Qt for OS X
-    \brief Platform support for OS X.
+    \title Qt for macOS
+    \brief Platform support for \macos.
     \ingroup supportedplatform
+    \keyword Qt for OS X
 
-    OS X is a UNIX platform and behaves similarly to other Unix-like
-    platforms. The main difference is that X11 is not used as the windowing
-    system. Instead, OS X uses its own native windowing system that is
-    accessible through the Cocoa API. Application development on OS X is
-    done using Xcode, which is available from \l{https://developer.apple.com/xcode/}.
+    \macos (previously known as OS X or Mac OS X) is a UNIX platform and
+    behaves similarly to other Unix-like platforms. The main difference is
+    that X11 is not used as the windowing system. Instead, \macos uses its own
+    native windowing system that is accessible through the Cocoa API.
+    Application development on \macos is done using Xcode, which is available
+    from \l{https://developer.apple.com/xcode/}.
 
     \section1 Downloading and Installing Qt
 
@@ -52,14 +54,14 @@
 
     Below, you will find more information about building Qt from source.
     \list
-        \li \l{Qt for OS X - Building from Source} - building and installing from source
+        \li \l{Qt for macOS - Building from Source} - building and installing from source
     \endlist
 
     \note Qt 5 uses Cocoa, therefore, building for Carbon is not possible.
 
-    \section1 OS X Versions
+    \section1 \macos Versions
 
-    See \l{Supported Platforms} for the list of OS X versions supported by Qt.
+    See \l{Supported Platforms} for the list of \macos versions supported by Qt.
 
     Qt can be built for either x86 or x86_64. 64-bit is used by default.
     To select a 32-bit build, use the \c macx-clang-32 or \c macx-g++32 mkspec.
@@ -107,13 +109,13 @@
     CONFIG -= app_bundle
     \endcode
 
-    \section1 Deploying Applications on OS X
+    \section1 Deploying Applications on \macos
 
-    In general, Qt supports building on one OS X version and deploying to
-    earlier or later OS X versions. The recommended way is to build on the
-    latest version and deploy to an earlier OS X version.
+    In general, Qt supports building on one \macos version and deploying to
+    earlier or later \macos versions. The recommended way is to build on the
+    latest version and deploy to an earlier \macos version.
 
-    OS X applications are typically deployed as self-contained application
+    \macos applications are typically deployed as self-contained application
     bundles. The application bundle contains the application executable as well
     as dependencies such as the Qt libraries, plugins, translations and other
     resources you may need. Third party libraries like Qt are normally not
@@ -121,22 +123,22 @@
 
     A common way to distribute applications is to provide a compressed disk
     image (.dmg file) that the user can mount in Finder. The deployment tool, \c
-    macdeployqt (available from the OS X installers), can be used to create
+    macdeployqt (available from the \macos installers), can be used to create
     the self-contained bundles, and optionally also create a .dmg archive.
     Applications can also be distributed through the Mac App Store. Qt 5 aims
     to stay within the app store sandbox rules. macdeployqt (bin/macdeployqt)
     can be used as a starting point for app store deployment.
 
     \list
-    \li \l{Qt for OS X - Deployment}
+    \li \l{Qt for macOS - Deployment}
     \endlist
 
-    \section1 OS X Issues
+    \section1 \macos Issues
 
     The page below covers specific issues and recommendations for creating
-    OS X applications.
+    \macos applications.
     \list
-    \li \l{Qt for OS X - Specific Issues}
+    \li \l{Qt for macOS - Specific Issues}
     \endlist
 
     \section1 Where to Go from Here
@@ -158,8 +160,8 @@
 
 /*!
     \page osx-requirements.html
-    \title Qt for OS X - Requirements
-    \brief Setting up the OS X environment for Qt.
+    \title Qt for macOS - Requirements
+    \brief Setting up the \macos environment for Qt.
 
     Qt requires Xcode to be installed on the system. You can get it from:
 
@@ -167,7 +169,7 @@
 
     \section1 Required Compiler Versions
 
-    Qt for OS X is tested and compatible with several versions of GCC (GNU
+    Qt for macOS is tested and compatible with several versions of GCC (GNU
     Compiler Collection) and Clang (as available from Xcode). For a list of
     tested configurations, refer to the \e{Reference Configuration} section of
     the \l{Community Supported Platforms#Reference Configurations}{supported platforms}
@@ -181,11 +183,11 @@
 
 /*!
     \page osx-building.html
-    \title Qt for OS X - Building from Source
-    \brief How to install Qt on OS X.
+    \title Qt for macOS - Building from Source
+    \brief How to install Qt on \macos.
 
-    Qt for OS X has some requirements that are given in more detail
-    in the \l{Qt for OS X Requirements} document.
+    Qt for macOS has some requirements that are given in more detail
+    in the \l{Qt for macOS Requirements} document.
 
     The following instructions describe how to install Qt from the source package.
     You can download the Qt 5 sources from the \l{Downloads} page. For
@@ -270,30 +272,30 @@
 
 /*!
     \page osx-issues.html
-    \title Qt for OS X - Specific Issues
-    \brief A description of issues with Qt that are specific to OS X.
+    \title Qt for macOS - Specific Issues
+    \brief A description of issues with Qt that are specific to \macos.
 
-    This page outlines the main issues regarding OS X support in Qt.
-    OS X terminologies and specific processes are found at
+    This page outlines the main issues regarding \macos support in Qt.
+    \macos terminologies and specific processes are found at
     \l{https://developer.apple.com/}.
 
     \section1 Aqua
 
-    Aqua is an essential part of the OS X platform. As with Cocoa and
+    Aqua is an essential part of the \macos platform. As with Cocoa and
     Carbon, Qt provides widgets that look like those described in the Human
     Interface Descriptions. Qt's widgets use HIThemes to implement the look and
     feel. In other words, we use Apple's own APIs for doing the rendering. More
     documentation about Aqua is found at the
      \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html#//apple_ref/doc/uid/20000957}
-     {OS X Human Interface Guidelines}.
+     {\macos Human Interface Guidelines}.
 
     The \l{Macintosh Style Widget Gallery} page
-    contains sample images of widgets using the OS X platform theme.
+    contains sample images of widgets using the \macos platform theme.
 
-    \section2 Qt Attributes for OS X
+    \section2 Qt Attributes for \macos
 
     The following lists a set of useful attributes that can be used to tweak
-    applications on OS X:
+    applications on \macos:
 
     \list
     \li Qt::AA_MacPluginApplication
@@ -316,17 +318,17 @@
     \li QMainWindow::unifiedTitleAndToolBarOnMac
     \endlist
 
-    OS X always double buffers the screen, therefore, the
+    \macos always double buffers the screen, therefore, the
     Qt::WA_PaintOnScreen attribute has no effect. Also it is impossible to paint
     outside of a paint event so Qt::WA_PaintOutsidePaintEvent has no effect
     either.
 
     \section2 Right Mouse Clicks
 
-    The QContextMenuEvent class provides right mouse click support for OS X
+    The QContextMenuEvent class provides right mouse click support for \macos
     applications. This will map to a context menu event, for example, a menu
     that will display a pop-up selection. This is the most common use of right
-    mouse clicks, and maps to a control-click with the OS X one-button mouse
+    mouse clicks, and maps to a control-click with the \macos one-button mouse
     support.
 
     \section2 Menu Bar
@@ -358,7 +360,7 @@
     section with the \l{#Limitations}{list of limitations} below has more
     information.
 
-    Qt provides support for the Global Menu Bar with QMenuBar. OS X users
+    Qt provides support for the Global Menu Bar with QMenuBar. \macos users
     expect to have a menu bar at the top of the screen and Qt honors this.
 
     Additionally, users expect certain conventions to be respected, for example
@@ -382,7 +384,7 @@
 
     \section2 Special Keys
 
-    To provide the expected behavior for Qt applications on OS X,
+    To provide the expected behavior for Qt applications on \macos,
     the Qt::Meta, Qt::MetaModifier, and Qt::META enum values
     correspond to the Control keys on the standard Apple keyboard,
     and the Qt::Control, Qt::ControlModifier, and Qt::CTRL enum values
@@ -397,25 +399,25 @@
 
     \section2 Accessiblity
 
-    Many users interact with OS X with assistive devices. With Qt the aim is
+    Many users interact with \macos with assistive devices. With Qt the aim is
     to make this automatic in your application so that it conforms to accepted
     practice on its platform. Qt uses Apple's accessibility framework to provide
     access to users with disabilities.
 
     \section1 Library and Deployment Support
 
-    Qt provides support for OS X structures such as Frameworks and bundles.
+    Qt provides support for \macos structures such as Frameworks and bundles.
     It is important to be aware of these structure as they directly affect the
     deployment of applications.
 
     Qt provides a deploy tool, \l{The Mac Deployment Tool}{macdeployqt}, to
-    simplify the deployment process. The \l{Qt for OS X - Deployment}
+    simplify the deployment process. The \l{Qt for macOS - Deployment}
     article covers the deployment process in more detail.
 
     \section2 Qt Libraries as Frameworks
 
     By default, Qt is built as a set of frameworks. Frameworks are the
-    OS X preferred way of distributing libraries. The
+    \macos preferred way of distributing libraries. The
     \l{http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/index.html}
     {Apple's Framework Programming Guide} site has far more information about
     Frameworks.
@@ -443,7 +445,7 @@
 
     \section2 Bundle-Based Libraries
 
-    If you want to use some dynamic libraries in the OS X
+    If you want to use some dynamic libraries in the \macos
     application bundle (the application directory), create a
     subdirectory named \e Frameworks in the application bundle
     directory and place your dynamic libraries there. The application
@@ -486,36 +488,34 @@
 
     \section1 Compile-Time Flags
 
-    The following flags are helpful when you want to define OS X specific
+    The following flags are helpful when you want to define \macos specific
     code:
 
     \list
     \li \c Q_OS_DARWIN is defined when Qt detects you are on a
-    Darwin-based system (including the Open Source version)
-    \li \c Q_OS_MAC is defined when you are on an Apple Darwin-based system such OS X
-    or iOS.
-    \li \c Q_OS_OSX is defined when you are on an OS X system.
+    Darwin-based system such as \macos or iOS.
+    \li \c Q_OS_MACOS is defined when you are on an \macos system.
     \endlist
 
     \note \c Q_WS_MAC is no longer defined in Qt 5.
 
-    If you want to define code for specific versions of OS X, use
+    If you want to define code for specific versions of \macos, use
     the availability macros defined in \e{/usr/include/AvailabilityMacros.h}.
 
     The QSysInfo documentation has information about runtime version checking.
 
-    \section1 OS X Native API Access
+    \section1 \macos Native API Access
 
     \section2 Accessing the Bundle Path
 
-    OS X applications are structured as a directory (ending with \e .app).
+    \macos applications are structured as a directory (ending with \e .app).
     This directory contains sub-directories and files. It may be useful to place
     items, such as plugins and online documentation, inside this bundle. The
     following code returns the path of the application bundle:
 
     \snippet snippets/code/doc_src_mac-differences.cpp 1
 
-    \note When OS X is set to use Japanese, a bug causes this sequence
+    \note When \macos is set to use Japanese, a bug causes this sequence
     to fail and return an empty string. Therefore, always test the
     returned string.
 
@@ -600,11 +600,11 @@
 
     If you have installed the Qt for X11 package from \l{Fink}, it will set the
     \c QMAKESPEC environment variable to \c darwin-g++. This will cause problems when
-    you build the Qt for OS X package. To fix this, simply unset your \c
+    you build the Qt for macOS package. To fix this, simply unset your \c
     QMAKESPEC or set it to \c macx-g++ before you run \c configure. To get a
     fresh Qt distribution, run \c{make confclean} in the command-line.
 
-    \section2 MySQL and OS X
+    \section2 MySQL and \macos
 
     There seems to be a issue when both \c -prebind and \c -multi_module are
     defined when linking static C libraries into dynamic libraries. If you
@@ -615,18 +615,18 @@
     re-link Qt using -single_module. This is only a problem when building the
     MySQL driver into Qt. It does not affect plugins or static builds.
 
-    \section2 D-Bus and OS X
+    \section2 D-Bus and \macos
 
     The QtDBus module defaults to dynamically loading the libdbus-1 library on
-    OS X. That means applications linking against the QtDBus module will
-    load even on OS X systems that do not have the libraries, but they
+    \macos. That means applications linking against the QtDBus module will
+    load even on \macos systems that do not have the libraries, but they
     will fail to connect to any D-Bus server and they will fail to open a
     server using QDBusServer.
 
     To use D-Bus functionality, you need to install the libdbus-1 library, for
     example through Homebrew, Fink or MacPorts. You may want to include those
     libraries in your application's bundle if you're deploying to other
-    systems. Additionally, note that there is no system bus on OS X and
+    systems. Additionally, note that there is no system bus on \macos and
     that the session bus will only be started after launchd is configured to
     manage it.
 
@@ -652,7 +652,7 @@
 
     Qt has support for sheets, represented by the window flag, Qt::Sheet.
 
-    Usually, when referring to a native OS X application, \e native means an
+    Usually, when referring to a native \macos application, \e native means an
     application that interfaces directly to the underlying window system, rather
     than one that uses some intermediary layer. Qt applications run as first
     class citizens, just like Cocoa and Carbon applications. We use Cocoa
@@ -662,21 +662,21 @@
 
 /*!
     \page osx-deployment.html
-    \title Qt for OS X - Deployment
-    \brief Describes the deployment process for OS X.
+    \title Qt for macOS - Deployment
+    \brief Describes the deployment process for \macos.
 
-    This document describes how to create a \l{Qt for OS X}{OS X} bundle
+    This document describes how to create a \l{Qt for macOS}{\macos} bundle
     and make sure that the application finds the resources it needs at run-time.
     We demonstrate the procedures in terms of deploying the
     \l{tools/plugandpaint/app}{Plug & Paint} example application that comes with the
     Qt installation package.
 
-    The Qt installers for OS X include a \l
+    The Qt installers for \macos include a \l
     {macdeploy}{deployment tool} that automates the procedures described here.
 
     \section1 The Bundle
 
-    On OS X, a GUI application must be built and run from a bundle, which is a
+    On \macos, a GUI application must be built and run from a bundle, which is a
     directory structure that appears as a single  entity when viewed in the
     Finder. A bundle for an application typically contains the executable and
     all the resources it needs. Here is the snapshot of an application bundle
@@ -689,7 +689,7 @@
      \li It is easily installable as it is identified as a single entity.
      \li Information about a bundle is accessible from code.
     \endlist
-    This is specific to OS X and beyond the scope of this document. For
+    This is specific to \macos and beyond the scope of this document. For
     more information about bundles, see
     \l {http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html}{Apple's Developer Website}.
 
@@ -736,7 +736,7 @@
 
     Now, provided that everything compiled and linked without any
     errors, we should have a \c plugandpaint.app bundle ready
-    for deployment. Try installing the bundle on a machine running OS X
+    for deployment. Try installing the bundle on a machine running \macos
     that does not have Qt or any Qt applications installed.
 
     You can check what other libraries your application links to using
@@ -777,7 +777,7 @@
     approach, the bundle we have prepared so far is incomplete. The
     application will run, but the functionality will be disabled due
     to the missing plugins. To deploy plugin-based applications we
-    should use the framework approach, which is specific to OS X.
+    should use the framework approach, which is specific to \macos.
 
     \section1 Frameworks
 
@@ -805,7 +805,7 @@
     We assume that you already have installed Qt as frameworks, which
     is the default when installing Qt, in the /path/to/Qt
     directory. For more information on how to build Qt without Frameworks,
-    visit the \l{Qt for OS X - Specific Issues} documentation.
+    visit the \l{Qt for macOS - Specific Issues} documentation.
 
     When installing, the identification name of the frameworks is set. This
     name is used by the dynamic linker (\c dyld) to find the libraries for your
@@ -865,7 +865,7 @@
     \snippet snippets/code/doc_src_deployment.qdoc 39
 
     First we create a \c Frameworks directory inside the bundle. This
-    follows the OS X application convention. We then copy the
+    follows the \macos application convention. We then copy the
     frameworks into the new directory. As frameworks contain
     symbolic links, we use the \c -R option.
 
@@ -978,7 +978,7 @@
     making your application link to the correct Qt frameworks in the bundle
     using \c install_name_tool.
 
-    Now you should be able to move the application to another OS X
+    Now you should be able to move the application to another \macos
     machine and run it without Qt installed. Alternatively, you can
     move your frameworks that live outside of the bundle to another
     directory and see if the application still runs.
@@ -997,14 +997,14 @@
 
     Although the process of deploying an application do have some
     pitfalls, once you know the various issues you can easily create
-    packages that all your OS X users will enjoy.
+    packages that all your \macos users will enjoy.
 
     \section1 Application Dependencies
 
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
-    Platform Abstraction} (QPA) layer in Qt 5. For OS X, the name of the
+    Platform Abstraction} (QPA) layer in Qt 5. For \macos, the name of the
     platform plugin is \c {libqcocoa.dylib}. This file must be located within a
     specific subdirectory (by default, \c platforms) under your distribution
     directory. Alternatively, it is possible to adjust the search path Qt
@@ -1049,25 +1049,25 @@
 
     Compiler-specific libraries rarely have to be redistributed with your
     application. But there are several ways to deploy applications, as Qt can be
-    configured, built, and installed in several ways on OS X. Typically your
+    configured, built, and installed in several ways on \macos. Typically your
     goals help determine how you are going to deploy the application. The last
     sections describe a few things that you must be aware of while deploying
     your application.
 
-    \section2 OS X Version Dependencies
+    \section2 \macos Version Dependencies
 
-    Qt 5 applications can be built on the latest OS X version and deployed to
+    Qt 5 applications can be built on the latest \macos version and deployed to
     previous versions. This is achieved using \e{weak linking}. In
     \e{weak linking}, Qt tests whether a function added in a newer
-    version of OS X is available on the computer it is running
+    version of \macos is available on the computer it is running
     on. This allows Qt to use newer features when it runs on a newer
-    version of OS X, while remaining compatible on the older versions.
+    version of \macos, while remaining compatible on the older versions.
 
-    For more information about cross development issues on OS X,
+    For more information about cross development issues on \macos,
     see \l
     {https://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/cross_development/Introduction/Introduction.html}{Apple's Developer Website}.
 
-    The linker is set to be compatible with all OS X versions,
+    The linker is set to be compatible with all \macos versions,
     so you must change the \c MACOSX_DEPLOYMENT_TARGET environment
     variable to get \e{weak linking} to work for your application. You
     can add the following:
@@ -1139,7 +1139,7 @@
     \title Contributions to the Cocoa Platform Plugin Files
     \contentspage {Other Licenses Used in Qt}{Contents}
     \ingroup licensing
-    \brief License information for contributions by Apple, Inc. to specific parts of the Qt for OS X Cocoa port.
+    \brief License information for contributions by Apple, Inc. to specific parts of the Qt for macOS Cocoa port.
 
     This page is about the contributions to the following files
     \list
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index aa7789487..e08f43aa4 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -105,7 +105,7 @@
             \li \l{Platform and Compiler Notes - Android#Deployment}{Android}
             \li \l{Qt for iOS}{iOS}
             \li \l{Qt for Linux/X11 - Deployment}{Linux/X11}
-            \li \l{Qt for OS X - Deployment}{OS X}
+            \li \l{Qt for macOS - Deployment}{\macos}
             \li \l{Qt for Windows - Deployment}{Windows}
         \endlist
     \endlist
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index d57a43b9e..71e622ced 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -87,11 +87,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1, GCC 4.9.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li Apple OS X \b 10.8, \b 10.9, \b 10.10, 10.11
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos \b 10.8, \b 10.9, \b 10.10, 10.11
          \li \b {Clang as provided by Apple}
          \li
-    \row \li Apple OS X 10.7
+    \row \li \macos 10.7
          \li \li Deployment only
 
     \row \li {3,1} \header \li {3,1}
@@ -113,11 +113,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
     \row \li Windows Runtime (64-bit)
          \li \b {MSVC 2013}
          \li Windows 8.1 host
-    \row \li iOS 8.1 - OS X 10.9 host
+    \row \li iOS 8.1 - \macos 10.9 host
          \li \b {Clang as provided by Apple}
     \row \li Google Android (API Level: 22)
          \li \b {As provided by Google}
-         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, OS X 10.9, Windows 7, Windows 8
+         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, \macos 10.9, Windows 7, Windows 8
     \endtable
 
 //! [5.6] //! [latest]
@@ -162,11 +162,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1, GCC 4.9.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X 10.8, \b 10.9, \b 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos 10.8, \b 10.9, \b 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li i686-apple-darwin11-llvm-gcc-4.2
          \li
 
@@ -196,10 +196,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Windows 8.1 host
     \row \li iOS 8.1
          \li \b clang-600.0.54
-         \li OS X 10.9 host
+         \li \macos 10.9 host
     \row \li Google Android
          \li \b {As provided by Google}
-         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, OS X 10.9, Windows 7, Windows 8
+         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, \macos 10.9, Windows 7, Windows 8
     \endtable
 
 //! [5.5]
@@ -247,11 +247,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X 10.8, \b 10.9, \b 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos 10.8, \b 10.9, \b 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li \b i686-apple-darwin11-llvm-gcc-4.2
          \li
 
@@ -280,10 +280,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Windows 8 host
     \row \li iOS 8.1
          \li \b clang-600.0.54
-         \li OS X 10.9 host
+         \li \macos 10.9 host
     \row \li Google Android
          \li \b {As provided by Google}
-         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, OS X 10.9, Windows 7, Windows 8
+         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, \macos 10.9, Windows 7, Windows 8
     \endtable
 
 //! [5.4]
@@ -331,14 +331,14 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.6.1, GCC 4.6.3, GCC 4.8.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X \b 10.8, \b 10.9, 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos \b 10.8, \b 10.9, 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li \b i686-apple-darwin11-llvm-gcc-4.2
          \li
-    \row \li OS X 10.6
+    \row \li \macos 10.6
          \li \li Deployment only
 
     \row \li {3,1} \header \li {3,1}
@@ -366,10 +366,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Windows 8 host
     \row \li iOS 8.1
          \li \b clang-600.0.54
-         \li OS X 10.9 host
+         \li \macos 10.9 host
     \row \li Google Android
          \li \b {As provided by Google}
-         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, OS X 10.9, Windows 7, Windows 8
+         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, \macos 10.9, Windows 7, Windows 8
     \endtable
 
 //! [5.3]
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 99fa1b7d4..bf53a9d91 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -95,7 +95,7 @@ version 2.7 and onwards.
 
 For a set of basic UI controls, the \l{Qt Quick Controls} module implements
 several controls such as buttons, menus, and views. These controls mimic the
-native behavior found in different platforms such as Windows, OS X, and Linux.
+native behavior found in different platforms such as Windows, \macos, and Linux.
 
 \list
 \li \l{Qt Quick Controls Overview}
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index 0ba3f31a1..39269fa9d 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -222,7 +222,7 @@
       </td><td style="width:30%; border: none; vertical-align: top">
     \endraw
     \image qtquickcontrols-example-gallery-osx.png
-    \caption Controls gallery example on OS X
+    \caption Controls gallery example on \macos
     \raw HTML
       </td><td style="width:45%; border: none; vertical-align: top">
     \endraw
@@ -337,7 +337,7 @@
     \li \l{Qt Android Extras} enables you to integrate Java code into your Qt
     application.
 
-    \li \l{Qt Mac Extras} enables you to access specific features on OS X and
+    \li \l{Qt Mac Extras} enables you to access specific features on \macos and
     iOS.
 
     \li \l{Qt Windows Extras} enables you to use Windows-specific features
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 2dc0adb45..8aa27de96 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -147,7 +147,7 @@
         \li \l[QtBluetooth]{Qt Bluetooth}
         \li All
         \li \l{Qt for Android}{Android},
-        \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for OS X}{OS X}
+        \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for macOS}{\macos}
         \li Provides access to Bluetooth hardware.
     \row
         \li \l[QtCanvas3D]{Qt Canvas 3D}
@@ -184,8 +184,8 @@
     \row
         \li \l[QtMacExtras]{Qt Mac Extras}
         \li All
-        \li \l{Qt for OS X}{OS X}
-        \li Provides platform-specific APIs for OS X.
+        \li \l{Qt for macOS}{\macos}
+        \li Provides platform-specific APIs for \macos.
     \row
         \li \l[QtNfc]{Qt NFC}
         \li All
@@ -207,7 +207,7 @@
     \row
         \li \l[QtPositioning]{Qt Positioning}
         \li All
-        \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for OS X}{OS X},
+        \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for macOS}{\macos},
         \l{Qt for Linux/X11}{Linux}, \l{Qt for WinRT}{WinRT}.
         \li Provides access to position, satellite and area monitoring classes.
     \row
@@ -245,7 +245,7 @@
     \row
         \li \l[QtSerialPort]{Qt Serial Port}
         \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for macOS}{\macos}.
         \li Provides access to hardware and virtual serial ports.
     \row
         \li \l[QtSvg]{Qt SVG}
@@ -262,7 +262,7 @@
     \row
         \li \l[QtWebEngine]{Qt WebEngine}
         \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for macOS}{\macos}.
         \li Classes and functions for embedding web content in applications using the
             \l{http://www.chromium.org/Home}{Chromium browser project}.
     \row
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index bf8e68091..4671eaa15 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -787,7 +787,7 @@ recommendations for handling those changes.
     \list
      \li The \c {qttest_p4.prf} file is removed. Use \c{CONFIG+=testcase} and
          other flags instead.
-     \li The \c{-dwarf2} configure argument is removed. DWARF2 is always used on OS X now.
+     \li The \c{-dwarf2} configure argument is removed. DWARF2 is always used on \macos now.
      \li Configure no longer calls \c{qmake -recursive} by default, because the
          subsequent build invokes qmake as needed. Use \c{-fully-process} to
          restore the old behavior.
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 68ca2a793..a4ef003b8 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -148,7 +148,7 @@ choose the best suited tool for the job.
         \li X
         \li
         \li Qt Widgets and Qt Quick Controls integrate well to the underlying
-            platform, providing a native look'n'feel on Windows, Linux, and OS X.
+            platform, providing a native look'n'feel on Windows, Linux, and \macos.
     \row
         \li Custom look'n'feel
         \li X
diff --git a/doc/src/whatsnew/whatsnew55.qdoc b/doc/src/whatsnew/whatsnew55.qdoc
index 9c598e67a..3f133fec1 100644
--- a/doc/src/whatsnew/whatsnew55.qdoc
+++ b/doc/src/whatsnew/whatsnew55.qdoc
@@ -61,9 +61,9 @@
 
     \section2 Qt Bluetooth Module
     \list
-    \li Classic Bluetooth support added for \l{Qt for OS X}{OS X}.
+    \li Classic Bluetooth support added for \l{Qt for macOS}{\macos}.
     \li Bluetooth Low Energy support added for \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}
-    and \l{Qt for OS X}{OS X}
+    and \l{Qt for MacOS}{\macos}
     \endlist
 
     \section2 Qt Core Module
diff --git a/doc/src/whatsnew/whatsnew56.qdoc b/doc/src/whatsnew/whatsnew56.qdoc
index cc4e45473..069434c88 100644
--- a/doc/src/whatsnew/whatsnew56.qdoc
+++ b/doc/src/whatsnew/whatsnew56.qdoc
@@ -131,7 +131,7 @@
 
     \section2 Qt Platform Abstraction (QPA)
     \list
-        \li Optional support for using FreeType on OS X.
+        \li Optional support for using FreeType on \macos.
         \li Added support for NVIDIA Jetson TK1 Pro boards running Vibrante
             Linux via a new eglfs backend utilizing DRM, EGLDevice, and
             EGLStream.
@@ -146,7 +146,7 @@
 
     \section2 Qt Positioning Module
     \list
-        \li Added support for OS X.
+        \li Added support for \macos.
         \li Added support for GPS receivers exposed as a serial port on Windows
             desktop (all versions).
         \li Removed libgeoclue dependency for the GeoClue backend.