diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 19:10:34 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 19:10:34 +0200 |
| commit | 7b5df9862c3c7782da2d238b21173b24e75aa1b3 (patch) | |
| tree | 22870ee53bb6e5333291f6cb0734d4b493212459 | |
| parent | 14d35642a2bf064df7f2a22002b19e2e410f0208 (diff) | |
| parent | 39859e2103c74b8bb2879bda46e65ac342b57115 (diff) | |
Merge tag 'v6.5.8-lts' into 6.5.86.5.8
Qt 6.5.8-lts release
Conflicts solved:
CHROMIUM_VERSION
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: I271dd3cae831b5055b91c92b1ee837c92d8e5e4b
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.cmake.conf b/.cmake.conf index 70028824e..fe8d08922 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.7") +set(QT_REPO_MODULE_VERSION "6.5.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_WEBENGINE "3.19") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 2935355d4..bae37f438 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: 129.0.6668.70 +Patched with security patches up to Chromium version: 131.0.6778.85 diff --git a/dependencies.yaml b/dependencies.yaml index 0544b770a..108df4f3b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 4332989bef24c1039c9097db52196f05979f2b72 + ref: 7a39593d76d90bbbdb8715a314e515f8a60a7ef9 required: true ../tqtc-qtpositioning: - ref: 228243b0f03257e2664bb741d6d05ba1dd592a2c + ref: 2a5f20d834f67352d45696dbfce7f178bbf1f54e required: false ../tqtc-qttools: - ref: 6444be988641a3a96a49fb39f28af2c532397e65 + ref: 8a196a206722fbfba0ae84b4073a94aa32186a6a required: false ../tqtc-qtwebchannel: - ref: 5aa9ec6e2462aa85f8c8d6896b601b02f14b8367 + ref: 938ae45b683925de50036325e3216b86a04986bb required: false diff --git a/src/3rdparty b/src/3rdparty -Subproject bbefe10601f984a167699bf78abff2a8b8ed799 +Subproject 80e82a826304ac9ba4b5be7e6de3c24c60e0f94 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 9e91a7007..5d15c3958 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -1249,7 +1249,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "129.0.6668.70"; // FIXME: Remember to update + return "131.0.6778.85"; // FIXME: Remember to update } QT_END_NAMESPACE |