diff options
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -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 | ||||
| -rw-r--r-- | src/host/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/pdf/doc/images/multipageviewer.png | bin | 39637 -> 55795 bytes | |||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 2 |
7 files changed, 11 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 447f5cb72905af87851b4c10c5e728f58cea46b +Subproject c885ec409f9b6ffa25e03851729b1bc2ad2005b 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 diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt index 822fa8a27..6c110c98e 100644 --- a/src/host/CMakeLists.txt +++ b/src/host/CMakeLists.txt @@ -16,7 +16,7 @@ project(QtWebEngineConfigure VERSION "${QT_REPO_MODULE_VERSION}" LANGUAGES CXX C) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core) set(buildDir ${CMAKE_CURRENT_BINARY_DIR}) configure_gn_toolchain(host ${TEST_architecture_arch} ${TEST_architecture_arch} diff --git a/src/pdf/doc/images/multipageviewer.png b/src/pdf/doc/images/multipageviewer.png Binary files differindex 2f0bb62a2..f6ebd2d83 100644 --- a/src/pdf/doc/images/multipageviewer.png +++ b/src/pdf/doc/images/multipageviewer.png diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index f93d61b12..379fcae75 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -6,6 +6,7 @@ #include <QtGui/QPageLayout> #include <QtGui/qpageranges.h> +#include <QtWidgets/qmenu.h> #include <QtWidgets/qwidget.h> #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> @@ -18,6 +19,7 @@ class AutofillPopupWidget; QT_BEGIN_NAMESPACE class QContextMenuEvent; +class QMenu; class QPrinter; class QUrl; class QWebEngineContextMenuRequest; |
