Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

1 files changed, 9 insertions, 4 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 161983b70..3f70187e7 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -77,11 +77,16 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
         QSurfaceFormat sharedFormat = globalSharedContext->format();
 
 #ifdef Q_OS_OSX
-        // Check that the default QSurfaceFormat OpenGL profile matches the global OpenGL shared
-        // context profile, otherwise this could lead to a nasty crash.
+        // Check that the default QSurfaceFormat OpenGL profile is compatible with the global OpenGL
+        // shared context profile, otherwise this could lead to a nasty crash.
         QSurfaceFormat defaultFormat = QSurfaceFormat::defaultFormat();
-        if (defaultFormat.profile() != sharedFormat.profile()) {
-            qFatal("QWebEngine: Default QSurfaceFormat OpenGL profile does not match global shared context OpenGL profile. Please make sure you set a new QSurfaceFormat before the QtGui application instance is created.");
+
+        if (defaultFormat.profile() != sharedFormat.profile()
+            && defaultFormat.profile() == QSurfaceFormat::CoreProfile
+            && defaultFormat.version() >= qMakePair(3, 2)) {
+            qFatal("QWebEngine: Default QSurfaceFormat OpenGL profile is not compatible with the "
+                   "global shared context OpenGL profile. Please make sure you set a compatible "
+                   "QSurfaceFormat before the QtGui application instance is created.");
         }
 #endif