diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2023-08-07 11:43:48 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-08-07 14:13:40 +0200 |
| commit | ebca1ea6c36742182179541077c3bbda63fd1b39 (patch) | |
| tree | 788512991b288a7eb9e5dd51a45f764b2dae31de | |
| parent | fb47deb9203ca2d43c108075245945fd099be854 (diff) | |
Fixup: Support MSVC 2019
Commit aacf93e14a6f102b79f4506b334ae8a4b014f0c2 contained a preliminary
SHA1 for the qtwebengine-chromium repository.
Update docs and the Chromium security patch version.
Fixes: QTBUG-115713
Change-Id: Ic50d191b614144e624c747657303a0aff09907cd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/doc/src/qtwebengine-platform-notes.qdoc | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index a024b4f70..55edfe57d 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: 114.0.5735.133 +Patched with security patches up to Chromium version: 115.0.5790.98 diff --git a/src/3rdparty b/src/3rdparty -Subproject 96cc1f936fc89d474f9140e8dd7e682482f2300 +Subproject fe861d4b449cf832b35d04515a6f978c6691c23 diff --git a/src/core/doc/src/qtwebengine-platform-notes.qdoc b/src/core/doc/src/qtwebengine-platform-notes.qdoc index aecffa4a1..fcca298e5 100644 --- a/src/core/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/core/doc/src/qtwebengine-platform-notes.qdoc @@ -46,7 +46,7 @@ On Windows, the following additional tools are required: \list - \li Visual Studio 2022 or later, or clang-cl version 10 or later + \li Visual Studio 2019 or later, or clang-cl version 10 or later \li Active Template Library (ATL), usually included in the Visual Studio installation \li Windows 11 SDK version 10.0.22621.0 or later diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 32ddded9b..1a2847d3f 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -931,7 +931,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "114.0.5735.133"; // FIXME: Remember to update + return "115.0.5790.98"; // FIXME: Remember to update } QT_END_NAMESPACE |