Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ia5591669e96fca7f477a39c34573db086d07b221

8 files changed, 11 insertions, 11 deletions

diff --git a/README b/README
index a6637d6..f66f148 100644
--- a/README
+++ b/README
@@ -1 +1 @@
-Qt Mac Extras: Platform specific components for Mac OS X.
+Qt Mac Extras: Platform specific components for OS X and iOS.
diff --git a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
index e5bab01..bad6c85 100644
--- a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
+++ b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
@@ -32,10 +32,10 @@
     \brief Demonstrates embedding a QWindow into an view hierarchy of a Mac
     OS X application.
 
-    This Mac OS X-specific example shows how to create a view hierarchy
+    This OS X-specific example shows how to create a view hierarchy
     containing a QWindow, with handling of Qt's mouse and keyboard events.
 
     \include examples-run.qdocinc
 
-    \sa {Qt for Mac OS X}, {Qt Mac Extras}
+    \sa {Qt for OS X}, {Qt Mac Extras}
 */
diff --git a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
index bcd6f40..ed7dc37 100644
--- a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
+++ b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
@@ -36,5 +36,5 @@
 
     \include examples-run.qdocinc
 
-    \sa {Qt for Mac OS X}, {Qt Mac Extras}
+    \sa {Qt for OS X}, {Qt Mac Extras}
 */
diff --git a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
index df99169..c25e6d1 100644
--- a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
+++ b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
@@ -33,12 +33,12 @@
 
     This example shows how to use QMacPasteboardMime to do conversion
     between a MIME type and a Uniform Type Identifier (UTI) format used
-    on Mac OS X.
+    on OS X.
 
     The example creates a widget that accepts drag & drop events, and
     reads contents of dropped business cards in vCard format.
 
     \include examples-run.qdocinc
 
-    \sa {Qt for Mac OS X}, {Qt Mac Extras}
+    \sa {Qt for OS X}, {Qt Mac Extras}
 */
diff --git a/src/macextras/doc/src/qtmacextras-examples.qdoc b/src/macextras/doc/src/qtmacextras-examples.qdoc
index 4076278..eefb6ac 100644
--- a/src/macextras/doc/src/qtmacextras-examples.qdoc
+++ b/src/macextras/doc/src/qtmacextras-examples.qdoc
@@ -48,5 +48,5 @@
 Here is a list of example applications demonstrating the functionality
 provided by the \l{Qt Mac Extras} module.
 
-\note These examples work only on \l{Qt for Mac OS X}{Mac OS X} operating system.
+\note These examples work only on \l{Qt for OS X}{OS X} operating system.
 */
diff --git a/src/macextras/doc/src/qtmacextras-index.qdoc b/src/macextras/doc/src/qtmacextras-index.qdoc
index f0af333..62d9d38 100644
--- a/src/macextras/doc/src/qtmacextras-index.qdoc
+++ b/src/macextras/doc/src/qtmacextras-index.qdoc
@@ -41,10 +41,10 @@
 /*!
     \page qtmacextras-index.html
     \title Qt Mac Extras
-    \brief Provides functionality specific to Mac OS X and iOS operating systems.
+    \brief Provides functionality specific to the OS X and iOS operating systems.
 
     Qt Mac Extras provide classes and functions that enable you to use
-    miscellaneous functionality specific to Mac OS X and iOS operating systems.
+    miscellaneous functionality specific to the OS X and iOS operating systems.
 
     \section1 Getting Started
 
diff --git a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
index f636fdf..4f2f9e7 100644
--- a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
+++ b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
@@ -41,7 +41,7 @@
 /*!
     \module QtMacExtras
     \title Qt Mac Extras C++ Classes
-    \brief Provides classes and functions specific to Mac OS X and iOS operating systems.
+    \brief Provides classes and functions specific to OS X and iOS operating systems.
 
     \ingroup modules
     \ingroup technology-apis
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 2a76877..141d642 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     \namespace QtMac
     \inmodule QtMacExtras
     \since 5.2
-    \brief The QtMac namespace contains miscellaneous functionality specific to Mac OS X and iOS operating systems.
+    \brief The QtMac namespace contains miscellaneous functionality specific to the OS X and iOS operating systems.
     \inheaderfile QtMac
  */
 namespace QtMac