From b4d169e63641919bc8aea056f213cb69fdca98f3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 22 Nov 2022 12:02:53 +0100 Subject: Fix Chromium version documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Stop listing a number we forget to update, and document the process we use for selecting Chrome versions and patches levels. Pick-to: 6.4 Fixes: QTBUG-105146 Change-Id: I1cd632ef3fe3a4b1bf10a702a344ff69b2552d61 Reviewed-by: Vladimir Minenko Reviewed-by: Michael Brüning --- src/core/doc/src/qtwebengine-overview.qdoc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/doc/src/qtwebengine-overview.qdoc b/src/core/doc/src/qtwebengine-overview.qdoc index 8f5a7fe5e..193116b3e 100644 --- a/src/core/doc/src/qtwebengine-overview.qdoc +++ b/src/core/doc/src/qtwebengine-overview.qdoc @@ -68,10 +68,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 -- cgit v1.2.1