diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
| commit | d3525d33cb9085cf1ee61b437931555fe7d932ae (patch) | |
| tree | 527adee7c481769d0a77f96b25669ec86a606099 /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | |
| parent | f3aaa7531e7b429d958e7002e642f4b59568ff74 (diff) | |
| parent | 3c356bcf7c0fd4af7fb86824276c5a170ae10ace (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 8 |
1 files changed, 5 insertions, 3 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 90eb0e76e..161983b70 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -86,9 +86,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); |