diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-03-12 15:39:06 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2018-03-13 16:50:43 +0000 |
commit | fde0040d5bba1ded3e36f56c7ca3c8f16380b413 (patch) | |
tree | 93c07a73e776c53756ec959a6f655bbda8468ba9 | |
parent | 31a954a5e8be1ea30336d99a21ad2e76d21cdbcd (diff) |
Fix freezes of glx context, update Chromium
Bring back switch for QSurfaceFormat::CompatibilityProfile.
This commit pulls in corresponding change in Chromium.
Change-Id: I1f1b139acdda8a2e7ce7e71f2675e797dcfdb9e3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
m--------- | src/3rdparty | 0 | ||||
-rw-r--r-- | src/core/web_engine_context.cpp | 6 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 458ee912871b76ad351e946d4d84c70ebe7a429 +Subproject 899b407b1128d0dbba360022a5ced872fabeec3 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index bdb61d0d3..e6907cb8a 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -470,10 +470,8 @@ WebEngineContext::WebEngineContext() } } } - -// FIXME: -// if (qt_gl_global_share_context()->format().profile() == QSurfaceFormat::CompatibilityProfile) -// parsedCommandLine->AppendSwitch(switches::kCreateDefaultGLContext); + if (qt_gl_global_share_context()->format().profile() == QSurfaceFormat::CompatibilityProfile) + parsedCommandLine->AppendSwitch(switches::kCreateDefaultGLContext); } else { qWarning("WebEngineContext used before QtWebEngine::initialize() or OpenGL context creation failed."); } |