diff options
| author | Tarja Sundqvist <[email protected]> | 2025-03-21 21:42:22 +0100 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-03-21 21:42:22 +0100 |
| commit | 000ac815698c95de530f1cd96f13dd1032a7d1e8 (patch) | |
| tree | 09428061ad4eae3e06d23659ee23aee22f9e3025 | |
| parent | a62a93331ff59e762b0f7d26051a8cb6afdd2ce5 (diff) | |
| parent | d82e573d693bb21398779216c06b335412a8bfa8 (diff) | |
Merge branch 'tqtc/lts-6.2.12' into 6.2.126.2.12
Change-Id: I4182f3269753699be5b3588021bb413335c2ca3e
| -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 | ||||
| -rw-r--r-- | src/process/CMakeLists.txt | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index e019b1f82..b4c420845 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.2.11") +set(QT_REPO_MODULE_VERSION "6.2.12") 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 21a6b0c46..4504de817 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: 119.0.6045.199 +Patched with security patches up to Chromium version: 122.0.6261.58 diff --git a/dependencies.yaml b/dependencies.yaml index 756331732..ff5192561 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 3d6ea255dba81dd08532d56d4af6a56cb71940aa + ref: 5880b113a6dcd08cb84b542f86b9f6b90b626514 required: true ../tqtc-qtpositioning: - ref: e813030505e557d267ace2402192e13b2fb049ac + ref: 434b0697b4883d31200e4dfbfec7a73eed4bbbf6 required: false ../tqtc-qttools: - ref: 3818cdf1a1e511aa2bb9fab9347af7b7d9829d90 + ref: 44da00e46a4a2329927f7f6e1d2e58d1fbd8ba87 required: false ../tqtc-qtwebchannel: - ref: dce5931854e827e049e72ad83b6945a32be7115a + ref: 3519d388fb64dfa2404a0a73afb4f598e42534b7 required: false diff --git a/src/3rdparty b/src/3rdparty -Subproject 21bb29b9b730cc215ee7dfb3cf343139a9be952 +Subproject 524df60af8ebd0c35fb3d1cc5f53d5ddf442a95 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 52be749c2..094d9eda5 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 "119.0.6045.199"; // FIXME: Remember to update + return "122.0.6261.128"; // FIXME: Remember to update } QT_END_NAMESPACE diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt index 80cc238f9..a7a894e7f 100644 --- a/src/process/CMakeLists.txt +++ b/src/process/CMakeLists.txt @@ -23,7 +23,7 @@ if(WIN32) set_property(TARGET ${qtWebEngineProcessName} PROPERTY WIN32_EXECUTABLE TRUE) # get libs rsp file, since cmake is not aware of PUBLIC libs for WebEngineCore get_target_property(libs_rsp WebEngineCore LIBS_RSP) - target_link_options(${qtWebEngineProcessName} PRIVATE "@${libs_rsp}") + target_link_options(${qtWebEngineProcessName} PRIVATE "@${libs_rsp}" "/STACK:0x800000") endif() if(MACOS) |