9 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index 954161b60b..8db998fefb 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -208,7 +208,7 @@ QT_BEGIN_NAMESPACE
     instance, even if they are referring to the same setting in the same category.
 
     The information is stored in the system registry on Windows, and in XML
-    preferences files on OS X. On other Unix systems, in the absence of a
+    preferences files on \macos. On other Unix systems, in the absence of a
     standard, INI text files are used. See \l QSettings documentation for
     more details.
 
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index c0cfc3e1aa..58cc650e01 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -389,7 +389,7 @@ directory.
 When building this example on Windows or Linux, the \c Charts directory will be
 located at the same level as the application that uses our new import module.
 This way, the QML engine will find our module as the default search path for QML
-imports includes the directory of the application executable. On OS X, the
+imports includes the directory of the application executable. On \macos, the
 plugin binary is copied to \c Contents/PlugIns in the the application bundle;
 this path is set in \l {tutorials/extending-qml/chapter6-plugins/app.pro}
 {chapter6-plugins/app.pro}:
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 9a06f6b055..8f22533472 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -398,7 +398,7 @@ The following functions are also on the Qt object.
         \li \c "blackberry" - BlackBerry OS
         \li \c "ios" - iOS
         \li \c "linux" - Linux
-        \li \c "osx" - OS X
+        \li \c "osx" - \macos
         \li \c "unix" - Other Unix-based OS
         \li \c "windows" - Windows
         \li \c "wince" - Windows CE
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index c4e0c7b778..dfdf2edbe0 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1658,7 +1658,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader,
   \header \li Platform \li Valid suffixes
   \row \li Windows     \li \c .dll
   \row \li Unix/Linux  \li \c .so
-  \row \li OS X    \li \c .dylib, \c .bundle, \c .so
+  \row \li \macos    \li \c .dylib, \c .bundle, \c .so
   \endtable
 
   Version number on unix are ignored.
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index caedd72dc5..e5cd7e2424 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -263,7 +263,7 @@ animations, process events, etc.
 \endlist
 
 The threaded renderer is currently used by default on Windows with
-opengl32.dll, Linux with non-Mesa based drivers, OS X, mobile
+opengl32.dll, Linux with non-Mesa based drivers, \macos, mobile
 platforms, and Embedded Linux with EGLFS but this is subject to
 change. It is possible to force use of the threaded renderer by
 setting \c {QSG_RENDER_LOOP=threaded} in the environment.
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 88deefbd9a..23a99ba616 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -323,7 +323,7 @@ Item {
     \qmlproperty point QtQuick::WheelEvent::pixelDelta
 
     This property holds the delta in screen pixels and is available in platforms that
-    have high-resolution trackpads, such as OS X.
+    have high-resolution trackpads, such as \macos.
     The x and y cordinate of this property holds the delta in horizontal and
     vertical orientation. The value should be used directly to scroll content on screen.
 
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index f419d570f3..70b3ca6450 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -239,7 +239,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
     \since 5.5
 
     This signal is emitted when the pinch area detects the smart zoom gesture.
-    This gesture occurs only on certain operating systems such as OS X.
+    This gesture occurs only on certain operating systems such as \macos.
 
     The \l {PinchEvent}{pinch} parameter provides information about the pinch
     gesture, including the location where the gesture occurred.  \c pinch.scale
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index ffc94dfd46..f3b217dd7f 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -78,7 +78,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
     and setting \l echoMode to an appropriate value enables TextInput to be used for
     a password input field.
 
-    On OS X, the Up/Down key bindings for Home/End are explicitly disabled.
+    On \macos, the Up/Down key bindings for Home/End are explicitly disabled.
     If you want such bindings (on any platform), you will need to construct them in QML.
 
     \sa TextEdit, Text
diff --git a/src/quick/util/qquickshortcut.cpp b/src/quick/util/qquickshortcut.cpp
index e6f66f7bf1..d47f2282b7 100644
--- a/src/quick/util/qquickshortcut.cpp
+++ b/src/quick/util/qquickshortcut.cpp
@@ -138,7 +138,7 @@ void QQuickShortcut::setSequence(const QVariant &sequence)
     \since 5.6
 
     This property provides the shortcut's key sequence as a platform specific
-    string. This means that it will be shown translated, and on OS X it will
+    string. This means that it will be shown translated, and on \macos it will
     resemble a key sequence from the menu bar. It is best to display this text
     to the user (for example, on a tooltip).