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

3 files changed, 4 insertions, 13 deletions

diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 0418873be..2afd8c3ae 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -168,7 +168,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins)
 #endif
 #if defined(Q_OS_LINUX)
     pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome
-                << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu
+                << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu, package pepperflashplugin-nonfree
+                << "/usr/lib/adobe-flashplugin/libpepflashplayer.so" // Ubuntu, package adobe-flashplugin
                 << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch
                 << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE
     pluginPaths << ppapiPluginsPath() + QStringLiteral("/libpepflashplayer.so");
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp
index b38e90c69..9683245a0 100644
--- a/src/core/media_capture_devices_dispatcher.cpp
+++ b/src/core/media_capture_devices_dispatcher.cpp
@@ -165,7 +165,6 @@ void MediaCaptureDevicesDispatcher::handleMediaAccessPermissionResponse(content:
     if (securityOriginsMatch && (microphoneRequested || webcamRequested)) {
         switch (request.request_type) {
         case content::MEDIA_OPEN_DEVICE_PEPPER_ONLY:
-            Q_UNREACHABLE(); // only speculative as this is for Pepper
             getDefaultDevices("", "", microphoneRequested, webcamRequested, &devices);
             break;
         case content::MEDIA_DEVICE_ACCESS:
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index bf6a6a172..0d1d7b127 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -313,7 +313,7 @@ WebEngineContext::WebEngineContext()
 
     const char *glType = 0;
     if (!usingANGLE() && !usingSoftwareDynamicGL() && !usingQtQuick2DRenderer()) {
-        if (qt_gl_global_share_context()) {
+        if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
             if (!strcmp(qt_gl_global_share_context()->nativeHandle().typeName(), "QEGLNativeContext")) {
                 if (qt_gl_global_share_context()->isOpenGLES()) {
                     glType = gfx::kGLImplementationEGLName;
@@ -347,16 +347,7 @@ WebEngineContext::WebEngineContext()
                     glType = gfx::kGLImplementationDesktopName;
             }
         } else {
-            qWarning("WebEngineContext used before QtWebEngine::initialize()");
-            // We have to assume the default OpenGL module type will be used.
-            switch (QOpenGLContext::openGLModuleType()) {
-            case QOpenGLContext::LibGL:
-                glType = gfx::kGLImplementationDesktopName;
-                break;
-            case QOpenGLContext::LibGLES:
-                glType = gfx::kGLImplementationEGLName;
-                break;
-            }
+            qWarning("WebEngineContext used before QtWebEngine::initialize() or OpenGL context creation failed.");
         }
     }