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

Conflicts:
	.qmake.conf

Change-Id: I930a14d0d39b9e87b500d2d3b34ebd0f0a88d03d

5 files changed, 6 insertions, 6 deletions

diff --git a/src/macextras/doc/src/qtmacextras-examples.qdoc b/src/macextras/doc/src/qtmacextras-examples.qdoc
index 9c3bc50..ce6d305 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 OS X}{OS X} operating system.
+\note These examples work only on \l{Qt for macOS}{\macos} operating system.
 */
diff --git a/src/macextras/doc/src/qtmacextras-index.qdoc b/src/macextras/doc/src/qtmacextras-index.qdoc
index 0f02337..d2dd3dc 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 the OS X operating system.
+    \brief Provides functionality specific to the \macos operating system.
 
     Qt Mac Extras provide classes and functions that enable you to use
-    miscellaneous functionality specific to the OS X and iOS operating systems.
+    miscellaneous functionality specific to the \macos 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 2d787ea..eb2a650 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 OS X and iOS operating systems.
+    \brief Provides classes and functions specific to \macos and iOS operating systems.
 
     \ingroup modules
     \ingroup technology-apis
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 014396f..1171598 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     \namespace QtMac
     \inmodule QtMacExtras
     \since 5.2
-    \brief The QtMac namespace contains miscellaneous functionality specific to the OS X and iOS operating systems.
+    \brief The QtMac namespace contains miscellaneous functionality specific to the \macos and iOS operating systems.
     \inheaderfile QtMac
  */
 
diff --git a/src/macextras/qmacfunctions_ios.mm b/src/macextras/qmacfunctions_ios.mm
index cbcdb5b..f2b8e57 100644
--- a/src/macextras/qmacfunctions_ios.mm
+++ b/src/macextras/qmacfunctions_ios.mm
@@ -57,7 +57,7 @@ CGContextRef currentCGContext()
 
     Sets the value shown on the application icon a.k.a badge to \a number.
 
-    Unlike its OS X counterpart, only numbers can be used.
+    Unlike its \macos counterpart, only numbers can be used.
 
     \sa applicationIconBadgeNumber(), setBadgeLabelText()
 */