summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-11-13 15:04:07 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-11-13 15:04:07 +0100
commitbefa6cc99722ccef6635071cc35463f8429aef29 (patch)
treed1a1ae305e33f67b1cb3e2d30a5726c0e06a37f8 /src/webengine
parent7db70f1e85f628f78df84eb195473fb315e812fe (diff)
parent4d6de2ba36ff4fe17b0e1c8ee7de4f63e2778c9e (diff)
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 9c2cbb414..bd5569e3f 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -89,7 +89,7 @@
\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 Qt WebEngine is based on Chromium version 65.0.3325.151, with
+ This version of Qt WebEngine is based on Chromium version 69.0.3497.128, with
additional security fixes from newer versions.
\section2 Qt WebEngine Process