Merge dev into 5.8

Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index e9da36a42af..ec6c0bcc360 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -116,22 +116,22 @@ QT_BEGIN_NAMESPACE
 
     \endlist
 
-    \section1 Notes for OS X Users
+    \section1 Notes for \macos Users
 
-    OS X supports a separate find buffer that holds the current
+    \macos supports a separate find buffer that holds the current
     search string in Find operations. This find clipboard can be accessed
     by specifying the FindBuffer mode.
 
-    \section1 Notes for Windows and OS X Users
+    \section1 Notes for Windows and \macos Users
 
     \list
 
-    \li Windows and OS X do not support the global mouse
+    \li Windows and \macos do not support the global mouse
     selection; they only supports the global clipboard, i.e. they
     only add text to the clipboard when an explicit copy or cut is
     made.
 
-    \li Windows and OS X does not have the concept of ownership;
+    \li Windows and \macos does not have the concept of ownership;
     the clipboard is a fully global resource so all applications are
     notified of changes.
 
@@ -187,7 +187,7 @@ QClipboard::~QClipboard()
 
     This signal is emitted when the clipboard data is changed.
 
-    On OS X and with Qt version 4.3 or higher, clipboard
+    On \macos and with Qt version 4.3 or higher, clipboard
     changes made by other applications will only be detected
     when the application is activated.
 
@@ -199,7 +199,7 @@ QClipboard::~QClipboard()
 
     This signal is emitted when the selection is changed. This only
     applies to windowing systems that support selections, e.g. X11.
-    Windows and OS X don't support selections.
+    Windows and \macos don't support selections.
 
     \sa dataChanged(), findBufferChanged(), changed()
 */
@@ -209,7 +209,7 @@ QClipboard::~QClipboard()
     \since 4.2
 
     This signal is emitted when the find buffer is changed. This only
-    applies to OS X.
+    applies to \macos.
 
     With Qt version 4.3 or higher, clipboard changes made by other
     applications will only be detected when the application is activated.
@@ -232,7 +232,7 @@ QClipboard::~QClipboard()
     systems with a global mouse selection (e.g. X11).
 
     \value FindBuffer indicates that data should be stored and retrieved from
-    the Find buffer. This mode is used for holding search strings on OS X.
+    the Find buffer. This mode is used for holding search strings on \macos.
 
     \omitvalue LastMode