summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2024-03-12 14:33:39 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2024-03-18 18:21:41 +0100
commit1345e33eb56a92f81b218f3db275d0565125f3b9 (patch)
treeae3ba0d44e46fa38ec7aad186177c96b05dc4bd2
parent23a26550cf044929f24a512427a0aee462ec0a1a (diff)
Update Chromium
Submodule src/3rdparty e403fbe5.. da62c2f7: * Fix clang-cl builds * [Backport] Security bug 325296797 * Fix python warning in gen.py * Fix build race condition for ozone build flags * Revert "Revert "Do not initialize default locale in local isolate"" * [Backport] CVE-2024-2173: Out of bounds memory access in V8 * [Backport] CVE-2024-1938: Type Confusion in V8 Fixes: QTBUG-122917 Fixes: QTBUG-123203 Change-Id: I5ea28b4a91eb7e506869371bb66122ad223f5286 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a5f3a494f77644b305aad0652d3eb58be2bb6009) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-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 2172fbfc3..8bdc0df63 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 118.0.5993.220
-Patched with security patches up to Chromium version: 122.0.6261.58
+Patched with security patches up to Chromium version: 122.0.6261.128
diff --git a/src/3rdparty b/src/3rdparty
-Subproject e403fbe59374f612e0b603bb5941eb78bccc5cb
+Subproject da62c2f7a445a04b0ad66502c94e6226cd7dea9
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 0cb68f44d..d1d0c7a9f 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -1007,7 +1007,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "122.0.6261.58"; // FIXME: Remember to update
+ return "122.0.6261.128"; // FIXME: Remember to update
}
QT_END_NAMESPACE