Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/io/qsettings.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp

Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03

4 files changed, 11 insertions, 11 deletions

diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
index 5d597b53a4..f8bd1f57a9 100644
--- a/src/widgets/styles/qmacstyle.qdoc
+++ b/src/widgets/styles/qmacstyle.qdoc
@@ -28,7 +28,7 @@
 
 /*!
     \class QMacStyle
-    \brief The QMacStyle class provides a OS X style using the Apple Appearance Manager.
+    \brief The QMacStyle class provides a \macos style using the Apple Appearance Manager.
 
     \ingroup appearance
     \inmodule QtWidgets
@@ -36,10 +36,10 @@
 
     This class is implemented as a wrapper to the HITheme
     APIs, allowing applications to be styled according to the current
-    theme in use on OS X. This is done by having primitives
-    in QStyle implemented in terms of what OS X would normally theme.
+    theme in use on \macos. This is done by having primitives
+    in QStyle implemented in terms of what \macos would normally theme.
 
-    \warning This style is only available on OS X because it relies on the
+    \warning This style is only available on \macos because it relies on the
     HITheme APIs.
 
     There are additional issues that should be taken
@@ -56,7 +56,7 @@
     involve horizontal and vertical widget alignment and widget size
     (covered below).
 
-    \li Widget size - OS X allows widgets to have specific fixed sizes.  Qt
+    \li Widget size - \macos allows widgets to have specific fixed sizes.  Qt
     does not fully implement this behavior so as to maintain cross-platform
     compatibility. As a result some widgets sizes may be inappropriate (and
     subsequently not rendered correctly by the HITheme APIs).The
@@ -75,7 +75,7 @@
     There are other issues that need to be considered in the feel of
     your application (including the general color scheme to match the
     Aqua colors). The Guidelines mentioned above will remain current
-    with new advances and design suggestions for OS X.
+    with new advances and design suggestions for \macos.
 
     Note that the functions provided by QMacStyle are
     reimplementations of QStyle functions; see QStyle for their
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 4dc517b78a..9a07eaf851 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -7197,7 +7197,7 @@ static CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintD
     returned if it can't be obtained. It is the caller's responsibility to
     CGContextRelease the context when finished using it.
 
-    \warning This function is only available on OS X.
+    \warning This function is only available on \macos.
     \warning This function is duplicated in the Cocoa platform plugin.
 */
 
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index c8970cc397..9714168afc 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -104,7 +104,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     The style gets all the information it needs to render the
     graphical element from the QStyleOption class. The widget is
     passed as the last argument in case the style needs it to perform
-    special effects (such as animated default buttons on OS X),
+    special effects (such as animated default buttons on \macos),
     but it isn't mandatory. In fact, QStyle can be used to draw on any
     paint device (not just widgets), in which case the widget argument
     is a zero pointer.
@@ -203,7 +203,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     QStyle gets all the information it needs to render the graphical
     element from QStyleOption. The widget is passed as the last
     argument in case the style needs it to perform special effects
-    (such as animated default buttons on OS X), but it isn't
+    (such as animated default buttons on \macos), but it isn't
     mandatory. In fact, you can use QStyle to draw on any paint
     device, not just widgets, by setting the QPainter properly.
 
@@ -1731,7 +1731,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
         desktop platforms.
 
     \value SH_Menu_SubMenuUniDirection Since Qt 5.5. If the cursor has
-        to move towards the submenu (like it is on OS X), or if the
+        to move towards the submenu (like it is on \macos), or if the
         cursor can move in any direction as long as it reaches the
         submenu before the sloppy timeout.
 
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 73e6f69041..71cf2fb267 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1750,7 +1750,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
     \value DefaultItem A menu item that is the default action as specified with \l QMenu::defaultAction().
     \value Separator A menu separator.
     \value SubMenu Indicates the menu item points to a sub-menu.
-    \value Scroller A popup menu scroller (currently only used on OS X).
+    \value Scroller A popup menu scroller (currently only used on \macos).
     \value TearOff A tear-off handle for the menu.
     \value Margin The margin of the menu.
     \value EmptyArea The empty area of the menu.