diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
| commit | fa4781b6691eff0d9eb2e9c8e536e9c09a23f054 (patch) | |
| tree | 416b3b3d0fdb89d19f951fae4b7ed779c0c32416 /src/core | |
| parent | 81047475209d3b78a06ec694f5d2aed9b325fe45 (diff) | |
| parent | 43cd26bfcd78f0b38f286f108ad7a04374695fce (diff) | |
Merge branch 'tqtc/lts-6.2.8' into 6.2.86.2.8
Change-Id: I87024a49104f1fc9b4418f7b7496a4a74de7eaa4
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/core/chromium_overrides.cpp | 1 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 10cae5768..b861a45c8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -442,6 +442,12 @@ foreach(arch ${archs}) ) endif() + if(QT_FEATURE_webengine_kerberos) + list(APPEND gnArgArg + external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi" + ) + endif() + if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm") check_thumb(armThumb) if(NOT armThumb AND NOT QT_FEATURE_system_ffmpeg) diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 2fa5caf1b..3830c8683 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -42,6 +42,7 @@ std::unique_ptr<VulkanImplementation> CreateVulkanImplementation(bool use_swifts return nullptr; } } // namespace gpu + #endif namespace content { diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 3bfd2069d..147c53b8e 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -891,7 +891,7 @@ const char *qWebEngineChromiumVersion() noexcept } const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "110.0.5481.78"; // FIXME: Remember to update + return "111.0.5563.110"; // FIXME: Remember to update } QT_END_NAMESPACE |