diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2024-02-29 14:38:38 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-04 16:35:29 +0000 |
| commit | f6716b7398079d3818926f98d69fb7ed5e99f456 (patch) | |
| tree | 9c023a50a0135a69b46f3ba3c8226c2fc68c8377 | |
| parent | 4af5bf87dfeeeab1b45366507b931090e58e933e (diff) | |
Update Chromium
Submodule src/3rdparty b9e19616d..9edd685c:
* [Backport] CVE-2024-1676: Inappropriate implementation in Navigation
* [Backport] CVE-2024-1672: Inappropriate implementation in Content Security Policy.
* [Backport] CVE-2024-1671: Inappropriate implementation in Site Isolation (2/2)
* [Backport] CVE-2024-1671: Inappropriate implementation in Site Isolation (1/2)
* [Backport] CVE-2024-1670: Use after free in Mojo
* [Backport] Security bug 1509340 / 41481948 (3/3)
* [Backport] Security bug 1509340 / 41481948 (2/3)
* [Backport] Security bug 1509340 / 41481948 (1/3)
* [Backport] Security bug 1504473 / 40945008
* [Backport] Security bug 1508758 / 41481379
* [Backport] Security bug 1518994
* Merge branch 'upstream-master' into 118-based
* Do not assert when ozone uses qt platform with vaapi
* Correctly load GL implementation parts in GPUInfo, in-process GPU mode
Task-number: QTBUG-121589
Task-number: QTBUG-118035
Change-Id: I1c98d66bb70e406324f4ca098654b179edbbe8f9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 88bd63503bcf16f6d73d0e32167e7524b941a7a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 3ac5f1ab8..2172fbfc3 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: 121.0.6167.160 +Patched with security patches up to Chromium version: 122.0.6261.58 diff --git a/src/3rdparty b/src/3rdparty -Subproject b9e19616d8d7cfef0440870e25c162fcdcc9e9b +Subproject 9edd685c47ec16dd6935ea7b872b37f8654e7a9 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index d858d0744..0cb68f44d 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 "121.0.6167.160"; // FIXME: Remember to update + return "122.0.6261.58"; // FIXME: Remember to update } QT_END_NAMESPACE |