diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-09-12 07:29:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-09-12 07:29:45 +0300 |
| commit | 48db16b9459a80442b568024d3a0debb07913e61 (patch) | |
| tree | b9107d29d202733f190e13e1c444adcddf6f76df | |
| parent | 000ac815698c95de530f1cd96f13dd1032a7d1e8 (diff) | |
| parent | 415dccbe8a3667ef8543c764dde6ee49ac67b132 (diff) | |
Merge tag 'v6.2.13-lts' into 6.2.136.2.13
Qt 6.2.13-lts release
Conflicts solved:
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: Iaf78a1877accff319b335bbb27198b242e12798a
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| -rw-r--r-- | cmake/Functions.cmake | 9 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
6 files changed, 16 insertions, 7 deletions
diff --git a/.cmake.conf b/.cmake.conf index b4c420845..720341761 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.2.12") +set(QT_REPO_MODULE_VERSION "6.2.13") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_WEBENGINE "3.19") diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 4504de817..5f76c330d 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: 122.0.6261.58 +Patched with security patches up to Chromium version: 127.0.6478.99 diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index f8bcf9a9a..02e984ebd 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1189,6 +1189,15 @@ function(add_gn_build_aritfacts_to_target cmakeTarget ninjaTarget module buildDi endforeach() list(GET archs 0 arch) set(target ${ninjaTarget}_${config}_${arch}) + # Work around for broken builds with new Apple linker ld_prime. Force + # use of the classic linker until this has been fixed. + # TODO: remove once this has been fixed by Apple. See issue FB13667242 + # or QTBUG-122655 for details. + if(APPLECLANG) + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0") + target_link_options(${cmakeTarget} PRIVATE -ld_classic) + endif() + endif() if(QT_IS_MACOS_UNIVERSAL) add_lipo_command(${target} ${buildDir}/${config}) endif() diff --git a/dependencies.yaml b/dependencies.yaml index ff5192561..3c92b835b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 5880b113a6dcd08cb84b542f86b9f6b90b626514 + ref: e436dad999060b92965291b45c0e95a3b93f5866 required: true ../tqtc-qtpositioning: - ref: 434b0697b4883d31200e4dfbfec7a73eed4bbbf6 + ref: 21e2cf35179db3110d087a6e8edf1635063142cb required: false ../tqtc-qttools: - ref: 44da00e46a4a2329927f7f6e1d2e58d1fbd8ba87 + ref: 70cb1950ded9a42875f4991c86ebd1d36754fde8 required: false ../tqtc-qtwebchannel: - ref: 3519d388fb64dfa2404a0a73afb4f598e42534b7 + ref: b0bee917ffe0747462f730735cda22b9bd6d2620 required: false diff --git a/src/3rdparty b/src/3rdparty -Subproject 524df60af8ebd0c35fb3d1cc5f53d5ddf442a95 +Subproject 1e2bebeee0aa59bd419c88af95f86ca13ecfc8d diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 094d9eda5..41926d534 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -974,7 +974,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "122.0.6261.128"; // FIXME: Remember to update + return "127.0.6478.99"; // FIXME: Remember to update } QT_END_NAMESPACE |