diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-07-08 17:36:56 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-04 12:45:23 +0200 |
commit | c570d4d36d415359e832d8f1da2bc703d5c68583 (patch) | |
tree | a94d7d3acb56b91026c532d58e5203c64637f15d /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | |
parent | ef432baaed4f8edb7ebe32fbcaf96a4c701e76e1 (diff) |
Move macOS surface format check to initialize
Change-Id: I08171340c8b5de3b38f17c95a70e3a8931394057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
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 | 14 |
1 files changed, 0 insertions, 14 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 498b4af79..49cc08da5 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -178,20 +178,6 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende QOpenGLContext *globalSharedContext = QOpenGLContext::globalShareContext(); if (globalSharedContext) { QSurfaceFormat sharedFormat = globalSharedContext->format(); - -#ifdef Q_OS_OSX - // 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() - && 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 int major; int minor; QSurfaceFormat::OpenGLContextProfile profile; |