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

Conflicts:
	doc/src/external-resources.qdoc
	doc/src/legal/3rdparty.qdoc
	doc/src/legal/licenses.qdoc
	doc/src/platforms/ios.qdoc
	doc/src/platforms/osx.qdoc
	doc/src/qt5-intro.qdoc

Change-Id: Ic021fa910795062c0f63f6263a2ab1441173488b

3 files changed, 7 insertions, 7 deletions

diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 74a895e59..115293532 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -77,7 +77,7 @@
     \c .rc file and run the \c rc or \c windres program on the \c .rc file,
     then link your application with the resulting \c .res file.
 
-    \section1 Setting the Application Icon on OS X
+    \section1 Setting the Application Icon on \macos
 
     The application icon, typically displayed in the application dock
     area, is set by calling QWindow::setWindowIcon() on a window. It is
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index 2b896e9f4..e1a4bbcf6 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -228,7 +228,7 @@
     evaluating JavaScript expressions comes with a performance cost.
 
     You can use bindings to handle low and high pixel density on platforms that
-    do not have automatic support for it (like OS X and iOS do).
+    do not have automatic support for it (like \macos and iOS do).
     The following code snippet uses the \l{Screen}{Screen.PixelDensity}
     attached property to specify different images to display on screens with
     low, high, or normal pixel density:
@@ -246,7 +246,7 @@
         }
     \endcode
 
-    On OS X and iOS, you can provide alternative resources with double the size
+    On \macos and iOS, you can provide alternative resources with double the size
     and the \e @2x identifier for icons and images and place them in the
     resource file. On Retina displays, the @2x versions are used automatically.
 
@@ -291,9 +291,9 @@
     For more information about high DPI support in Qt and the supported
     platforms, see \l{High DPI Displays}.
 
-    \section2 High DPI Scaling on OS X and iOS
+    \section2 High DPI Scaling on \macos and iOS
 
-    On OS X and iOS, applications use high DPI scaling that is an alternative to
+    On \macos and iOS, applications use high DPI scaling that is an alternative to
     the traditional DPI scaling. In the traditional approach, the application is
     presented with an DPI value used to multiply font sizes, layouts, and so on.
     In the new approach, the operating system provides Qt with a scaling ratio
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index dc1c99036..8d788c70c 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -62,7 +62,7 @@
 
     \section1 Protocols and Support on Different Platforms
 
-    On OS X, and Microsoft Windows versions prior to Windows 2000,
+    On \macos, and Microsoft Windows versions prior to Windows 2000,
     there is nothing like complete session management for applications
     yet, i.e. no restoring of previous sessions. (Windows 2000 and XP
     provide "hibernation" where the entire memory is saved to disk and
@@ -112,7 +112,7 @@
 
     \section1 Testing and Debugging Session Management
 
-    Session management support on OS X and Windows is fairly limited
+    Session management support on \macos and Windows is fairly limited
     due to the lack of this functionality in the operating system
     itself. Simply shut the session down and verify that your application
     behaves as expected. It may be useful to launch another application,