summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2023-10-11 11:06:19 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-13 00:26:22 +0000
commitf3014bcfafd48096e8ce9200703989fff5ca33a6 (patch)
treed792273c9615d497f7ed110ceae2533fd090c47d
parent5c442bb23f5953347e57f4a5e5a2ee9d35aab045 (diff)
Update Chromium
Submodule src/3rdparty 14780aaa..75a9a538: * [Backport] Add Intel Meteorlake GPU series type * Fix ffmpeg assembly with newer binutil * [Backport] Security bug 1447972 (2/2) * [Backport] Security bug 1447972 (1/2) * [Backport] Security bug 1479104 * [Backport] Security bug 1480184 * [Backport] CVE-2023-5217: Heap buffer overflow in vp8 encoding in libvpx * Zygote: Prevent leaking control socket to child processes * FIXUP: jumbo build * [Backport] Set ABSL_OPTION_USE_STD_ANY to 2 * [Backport] Replace uses of re2::StringPiece::set(). * [Backport] Make absl::string_view a typedef for std::string_view * Fix broken copy of non-BMP characters Fixes: QTBUG-117653 Change-Id: I49b82a1f97ffda0f7ba2b3607217a178e51ee222 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 482839a0d315722f006cdd90a3e2eff97a991b2c) 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 a9ed5a339..19f3aa7a6 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
Based on Chromium version: 112.0.5615.213
-Patched with security patches up to Chromium version: 117.0.5938.63
+Patched with security patches up to Chromium version: 117.0.5938.149
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 14780aaa6b0f85a6912878b3874c18e63c99a5d
+Subproject 75a9a5388ffe90c81e037ee19b2b28801e3a015
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 74c0b1672..05ce9d39c 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -965,7 +965,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "117.0.5938.63"; // FIXME: Remember to update
+ return "117.0.5938.149"; // FIXME: Remember to update
}
QT_END_NAMESPACE