summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-22 12:02:53 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-24 21:20:20 +0000
commitfee2dcc30220d38c328b8f0982b7429a6982bbac (patch)
tree2bf46fef6a65a36cbb71ac44e78a6999cbd81702
parent1d2a2230e8b5545b7bceca43313b805e2c965d9b (diff)
Fix Chromium version documentation
Stop listing a number we forget to update, and document the process we use for selecting Chrome versions and patches levels. Fixes: QTBUG-105146 Change-Id: I1cd632ef3fe3a4b1bf10a702a344ff69b2552d61 Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io> Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> (cherry picked from commit b4d169e63641919bc8aea056f213cb69fdca98f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/doc/src/qtwebengine-overview.qdoc15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/core/doc/src/qtwebengine-overview.qdoc b/src/core/doc/src/qtwebengine-overview.qdoc
index 3937ca9bb..522dea3f2 100644
--- a/src/core/doc/src/qtwebengine-overview.qdoc
+++ b/src/core/doc/src/qtwebengine-overview.qdoc
@@ -65,10 +65,19 @@
\l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview}
that is part of the documentation in the \l {Chromium Project} upstream source tree.
- This version of \QWE is based on Chromium version 94.0.4606, with additional security
- fixes from newer versions. The Chromium version can also be read at runtime using the
+ The Chromium version used is the one used by the latest stable Chrome version at the time of Qt feature freeze
+ for the current version of \QWE. Additional security patches are cherry picked from newer Chrome releases on
+ every patch release, security patches released in time for the Qt patch release freeze will be included.
+ If Chrome releases critical fixes outside our release window, the next patch release is sped up to ensure a
+ patched \QWE is released before the patch details goes public.
+
+ If you need a newer \QWE beyond security fixes, and can not update all of Qt, \QWE supports building with
+ older version of Qt back to the last Qt LTS. For instance \QWE 6.3, 6.4, and 6.5 can all be built with Qt 6.2.
+ In Qt LTS releases, \QWE may be fully replaced with such a newer version to make security patching easier.
+
+ The relevant Chromium versions in question can also be read at runtime using the
\l qWebEngineChromiumVersion() method, and \l qWebEngineChromiumSecurityPatchVersion()
- to read the current patch level. You can also find the versions in the QtWebEngine
+ to read the current security patch level. You can also find the versions in the \QWE
sources in the CHROMIUM_VERSION file.
\section2 Qt WebEngine Process