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

Change-Id: I29e1f5d7d146cc77f8cf92bfbe2e41ffad50a041

3 files changed, 7 insertions, 7 deletions

diff --git a/src/qdoc/doc/images/qt-logo.png b/src/qdoc/doc/images/qt-logo.png
index 6b72d5fb7..b63f1384b 100644
--- a/src/qdoc/doc/images/qt-logo.png
+++ b/src/qdoc/doc/images/qt-logo.png
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
index edd64b741..2552b9c1c 100644
--- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -2187,7 +2187,7 @@
         \image happyguy.jpg "Happy guy"
 
         Qt provides single-source portability across Microsoft
-        Windows, OS X, Linux, and all major commercial Unix
+        Windows, macOS, Linux, and all major commercial Unix
         variants. It is also available for embedded devices.
     * /
     \endcode
@@ -2200,7 +2200,7 @@
         \image happyguy.jpg image "Happy guy"
 
         Qt provides single-source portability across Microsoft
-        Windows, OS X, Linux, and all major commercial Unix
+        Windows, macOS, Linux, and all major commercial Unix
         variants. It is also available for embedded devices.
         \endquotation
 
@@ -3291,7 +3291,7 @@
            / *!
                Qt::HANDLE is a platform-specific handle type
                for system objects. This is  equivalent to
-               \c{void *} on Windows and OS X, and to
+               \c{void *} on Windows and macOS, and to
                \c{unsigned long} on X11.
 
                \warning Using this type is not portable.
@@ -3303,7 +3303,7 @@
            \quotation
                Qt::HANDLE is a platform-specific handle type
                for system objects. This is  equivalent to
-               \c{void *} on Windows and OS X, and to
+               \c{void *} on Windows and macOS, and to
                \c{unsigned long} on X11.
 
                \warning Using this type is not portable.
@@ -3888,7 +3888,7 @@
         \ingroup basicwidgets
 
         \meta {technology} {User Interface}
-        \meta {platform} {OS X 10.6}
+        \meta {platform} {macOS 10.6}
         \meta {platform} {MeeGo}
         \meta {audience} {user}
         \meta {audience} {programmer}
@@ -3928,7 +3928,7 @@
                    <component>QtGui</component>
                </prodinfo>
                <othermeta name="platform" content="MeeGo"/>
-               <othermeta name="platform" content="OS X 10.6"/>
+               <othermeta name="platform" content="macOS 10.6"/>
                <othermeta name="technology" content="User Interface"/>
            </metadata>
        </prolog>
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
index fa468d83a..9fd97457d 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -950,7 +950,7 @@
 
                Qt is a C++ toolkit for cross-platform GUI
                application development. Qt provides single-source
-               portability across Microsoft Windows, OS X, Linux,
+               portability across Microsoft Windows, macOS, Linux,
                and all major commercial Unix variants.
 
                Qt provides application developers with all the