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

Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc,
use the macro \macos.

Conflicts:
	src/core/media_capture_devices_dispatcher.cpp
	src/webengine/doc/src/qtwebengine-deploying.qdoc
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc

Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820

1 files changed, 8 insertions, 8 deletions

diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index f16258354..765295d30 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -41,7 +41,7 @@
     \list
         \li \l{Qt for Windows - Requirements}
         \li \l{Qt for X11 Requirements}
-        \li \l{Qt for OS X - Requirements}
+        \li \l{Qt for macOS - Requirements}
     \endlist
 
     In addition, the following tools are required for building the \l {Qt WebEngine} module:
@@ -50,7 +50,7 @@
         \li \l {All Platforms}
         \li \l {Windows}
         \li \l {Linux}
-        \li \l {OS X}
+        \li \l {macOS}
     \endlist
 
     The tests for skipping the Qt WebEngine build are located in the
@@ -99,17 +99,17 @@
 
     Further, development packages for \c khr and \c libcap need to be installed.
 
-    \section2 OS X
+    \section2 \macos
 
-    On OS X, the following are required:
+    On \macos, the following are required:
 
     \list
-        \li OS X 10.9 or later
+        \li \macos 10.9 or later
         \li Xcode 6.1 or later
-        \li OS X 10.10 SDK or later
+        \li \macos 10.10 SDK or later
     \endlist
 
-    \note Qt WebEngine cannot be built for the 32-bit mode of OS X (using the
+    \note Qt WebEngine cannot be built for the 32-bit mode of \macos (using the
     \c macx-clang-32 \c mkspec).
 
     \section1 Mac App Store Compatibility
@@ -137,7 +137,7 @@
     before the application instance is declared, to make sure that all created OpenGL contexts use
     the same OpenGL profile.
 
-    On OS X, if the default QSurfaceFormat is set after the application instance, the application
+    On \macos, if the default QSurfaceFormat is set after the application instance, the application
     will exit with qFatal(), and print a message that the default QSurfaceFormat should be set
     before the application instance.
 */