diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-21 21:42:22 +0100 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-21 21:42:22 +0100 |
| commit | 000ac815698c95de530f1cd96f13dd1032a7d1e8 (patch) | |
| tree | 09428061ad4eae3e06d23659ee23aee22f9e3025 /src | |
| parent | a62a93331ff59e762b0f7d26051a8cb6afdd2ce5 (diff) | |
| parent | d82e573d693bb21398779216c06b335412a8bfa8 (diff) | |
Merge branch 'tqtc/lts-6.2.12' into 6.2.126.2.12
Change-Id: I4182f3269753699be5b3588021bb413335c2ca3e
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 | ||||
| -rw-r--r-- | src/process/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 2 deletions
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) |