summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2023-08-30 10:11:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-09-01 23:23:59 +0000
commit6698b870a71cf9a86e974fed1545abea2d13bc59 (patch)
tree43f7c2eebcadf08ffd2c5a79730a563438b623b9
parent2c665f1b65cec5b331ef9692b5838c1a46ceda91 (diff)
Update Chromium
Submodule src/3rdparty b02cdcee..b295bd04: * FIXUP: Temporary fix for missing macOS 12.3 SDK * Temporary fix for missing macOS 12.3 SDK * Fix build with clang * Disable Windows IME for GPU thread Task-number: QTBUG-73994 Fixes: QTBUG-116278 Change-Id: I9894f341a82b0c5887d38e9d2597ecc2bde11392 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3e900b7a91a07fe356ffa9d5de8189cda93220a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--CHROMIUM_VERSION2
m---------src/3rdparty0
-rw-r--r--src/core/web_engine_context.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION
index 14d1a5775..7933480d1 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 108.0.5359.181
-Patched with security patches up to Chromium version: 115.0.5790.170
+Patched with security patches up to Chromium version: 116.0.5845.110
diff --git a/src/3rdparty b/src/3rdparty
-Subproject b02cdceebb1e7248f7e98f5ffb3eec10930ab94
+Subproject b295bd0409f7d8144879d9a047cda4919585b0f
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index f6115b3ad..8ff112510 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -931,7 +931,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "115.0.5790.170"; // FIXME: Remember to update
+ return "116.0.5845.110"; // FIXME: Remember to update
}
QT_END_NAMESPACE