From fde0040d5bba1ded3e36f56c7ca3c8f16380b413 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 12 Mar 2018 15:39:06 +0100
Subject: [PATCH] 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>
---
src/3rdparty | 2 +-
src/core/web_engine_context.cpp | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 458ee9128..899b407b1 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 458ee912871b76ad351e946d4d84c70ebe7a429b
+Subproject commit 899b407b1128d0dbba360022a5ced872fabeec3f
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.");
}
--
GitLab