summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Bruning <michael.bruning@theqtcompany.com>2016-01-29 15:37:52 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-18 07:25:55 +0000
commit29a58643f7e74393898813bf9ce7363ee32ac884 (patch)
treecd4149bfd2573ba379c4202b2080f2955f8d17e2 /src
parentbc2b0d81a8eff28852c9916a4768f05638d5d4cd (diff)
Document Chromium version also in the documentation.
The changes files may not be available or obvious for all users. Change-Id: I470e8bf70ebacc34457788f595ca0fa22349e580 Task-number: QTBUG-48098 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 53ff4b462..40e2a9a96 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -73,6 +73,9 @@
\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 snapshot version 45.0.2554.101, with
+ additional security fixes from the 46, 47 and 48 branches of the \l {Chromium Project}.
+
Chromium is tightly integrated to the \l{Qt Quick Scene Graph}{Qt Quick scene graph}, which is
based on OpenGL ES 2.0 or OpenGL 2.0 for its rendering. This provides you with one-pass
compositing of web content and all the Qt Quick UI. The integration to Chromium is transparent