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

Change-Id: I74e27960437e76876b9ed214db18e77e9e82408c

2 files changed, 5 insertions, 3 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 3f655a31b4979b0862e5aec1c8f47b597464749
+Subproject e63eb5276c8d141853e2c26bf1bac469ed60465
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 7eca835d5..92d0c6de9 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -83,9 +83,11 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
 #endif
 
         // Make sure the OpenGL profile of the QOpenGLWidget matches the shared context profile.
-        format.setMajorVersion(sharedFormat.majorVersion());
-        format.setMinorVersion(sharedFormat.minorVersion());
-        format.setProfile(sharedFormat.profile());
+        if (sharedFormat.profile() == QSurfaceFormat::CoreProfile) {
+            format.setMajorVersion(sharedFormat.majorVersion());
+            format.setMinorVersion(sharedFormat.minorVersion());
+            format.setProfile(sharedFormat.profile());
+        }
     }
 
     setFormat(format);