diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-06-26 13:24:01 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-08-26 13:18:46 +0200 |
| commit | 7aa99d8d5b0dbf024019e70bf39b7d15796e1080 (patch) | |
| tree | 643f2eb8c185c06263f76f6119248d71dc2f43a9 /src/core/browser_main_parts_qt.cpp | |
| parent | 6deddc5ecd6155c567aecd0338c53c63fa465bfd (diff) | |
Fix ScopedGLContextChecker with QTWEBENGINE_DISABLE_GPU_THREAD=1
The ScopedGLContextChecker, which deactivates the current
QOpenGLContext when executing Chromium tasks, is currently enabled
only if QOpenGLContext::supportsThreadedOpenGL() is false. But the gpu
thread can nowadays be disabled also with an environment variable and
ScopedGLContextChecker needs to take this into account.
Change-Id: I012524538b49b033ed053dbc41ed4350db916542
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 5988cec1a1b59aa163042a419c4c2e978bb814bb)
Diffstat (limited to 'src/core/browser_main_parts_qt.cpp')
| -rw-r--r-- | src/core/browser_main_parts_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/browser_main_parts_qt.cpp b/src/core/browser_main_parts_qt.cpp index 925c18664..45056fec2 100644 --- a/src/core/browser_main_parts_qt.cpp +++ b/src/core/browser_main_parts_qt.cpp @@ -190,7 +190,7 @@ private: } private: - bool m_enabled = !QOpenGLContext::supportsThreadedOpenGL(); + bool m_enabled = WebEngineContext::isGpuServiceOnUIThread(); #endif // QT_CONFIG(opengl) }; |