diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:50:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:50:12 +0100 |
| commit | 838d0f526888f7be1da006fbdacdd8e12a42341c (patch) | |
| tree | 9ece8e9674f1fac0a71647ec9e33459f76ab7a5a /src/webengine | |
| parent | 435586eedf983ab9b81291cb8cdfcce28822a0c4 (diff) | |
| parent | dde9bbb40ceed6409862e4cd31091270f99ea346 (diff) | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I4315127d8a329bcb65e6853d4f3625b6dbc55560
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 2f65db97a..8aaf4c714 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -63,7 +63,7 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW setFocus(true); setActiveFocusOnTab(true); -#ifdef Q_OS_OSX +#if defined(Q_OS_MACOS) && !defined(QT_NO_OPENGL) // Check that the default QSurfaceFormat OpenGL profile is compatible with the global OpenGL // shared context profile, otherwise this could lead to a nasty crash. QOpenGLContext *globalSharedContext = QOpenGLContext::globalShareContext(); |