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

4 files changed, 16 insertions, 15 deletions

diff --git a/src/webengine/doc/src/qtwebengine-deploying.qdoc b/src/webengine/doc/src/qtwebengine-deploying.qdoc
index b6b91f2e9..25b6d218c 100644
--- a/src/webengine/doc/src/qtwebengine-deploying.qdoc
+++ b/src/webengine/doc/src/qtwebengine-deploying.qdoc
@@ -30,7 +30,7 @@
     \title Deploying Qt WebEngine Applications
 
     The way to package and deploy applications varies between operating systems.
-    For Windows and macOS, \l{The Windows Deployment Tool}{windeployqt} and
+    For Windows and \macos, \l{The Windows Deployment Tool}{windeployqt} and
     \l{Deploying Applications on OS X}{macdeployqt} automate the steps to
     generate a stand-alone application package.
 
@@ -47,7 +47,7 @@
     limitations are:
 
     \list
-        \li Qt WebEngine currently supports only Windows, Linux, and macOS.
+        \li Qt WebEngine currently supports only Windows, Linux, and \macos.
 
         \li On Windows, Qt WebEngine only supports Windows Vista or newer as
             target platform. Due to use of newer API in Chromium, Windows XP is
@@ -102,7 +102,7 @@
     For Qt installations, this is \c QTDIR/libexec (Linux) or \c QTDIR\bin
     (Windows). The path can be changed by defining a \c qt.conf file, for
     example. Alternatively, an executable path can be set as a value of the
-    \c QTWEBENGINEPROCESS_PATH environment variable. On macOS, Qt WebEngine
+    \c QTWEBENGINEPROCESS_PATH environment variable. On \macos, Qt WebEngine
     looks for the executable in \c .app/Helpers/QtWebEngineProcess.
 
     \section2 Deploying Resources
@@ -128,7 +128,7 @@
     \list
         \li On Linux and Windows: the \c resources directory in the directory
             specified by QLibraryInfo::location(QLibraryInfo::DataPath)
-        \li On macOS: \c .app/Content/Resources
+        \li On \macos: \c .app/Content/Resources
     \endlist
 
     \section2 Translations
@@ -136,7 +136,7 @@
     Locale data (such as \c en-US.pak) is searched form the following locations:
 
     \list
-        \li On macOS: \c .app/Content/Resources
+        \li On \macos: \c .app/Content/Resources
         \li On Linux and Windows: \c qtwebengine_locales directory in the
             directory specified by
             QLibraryInfo::location(QLibraryInfo::TranslationsPath)
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc
index 52f7da928..62a09bb91 100644
--- a/src/webengine/doc/src/qtwebengine-features.qdoc
+++ b/src/webengine/doc/src/qtwebengine-features.qdoc
@@ -185,6 +185,7 @@
         \li Linux
             \code
             /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so
+            /usr/lib/adobe-flashplugin/libpepflashplayer.so
             /usr/lib/PepperFlash/libpepflashplayer.so
             /usr/lib64/chromium/PepperFlash/libpepflashplayer.so
             \endcode
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 6b5ccaa14..6c05b2e48 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -197,7 +197,7 @@
     \section1 Proxy Support
 
     If QNetworkProxy::applicationProxy is set, it will also be used for Qt WebEngine. Otherwise,
-    Qt WebEngine automatically picks up the proxy configuration from OS X and Windows. On Linux,
+    Qt WebEngine automatically picks up the proxy configuration from \macos and Windows. On Linux,
     it acknowledges settings from KDE and Gnome.
 
     If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted.
@@ -247,7 +247,7 @@
 
     \section1 Platform Notes
 
-    Qt WebEngine currently supports only Windows, Linux, and OS X. Due to Chromium build
+    Qt WebEngine currently supports only Windows, Linux, and \macos. Due to Chromium build
     requirements it also often requires a newer compiler than the rest of Qt. See
     \l{Qt WebEngine Platform Notes} for further details.
 
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.
 */