summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-11-09 17:49:10 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-11-10 16:40:46 +0000
commitcf55c06cf2a661be0e169a4406a9b79346d26ca5 (patch)
tree35e823f0967a0b5e89236a48e84f8e34fb97c8d7
parentca2098638a51f5541cce3f9d8a23c0c6fe76eaa7 (diff)
[Docs] Add clarification on differences between Chromium and Google Chrome.
Includes link to the upstream documentation that lives in the Chromium source tree. Change-Id: I7a4e061437547d554f004e8db3cec60c5c0d0800 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index fa30892d3..0e306db1d 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -67,6 +67,12 @@
specification than Qt WebKit. However, Qt WebEngine is thus heavier than Qt WebKit and does
not provide direct access to the network stack and the HTML document through C++ APIs.
+ Please note that Qt WebEngine is based on Chromium, but does not contain or use any services
+ or add-ons that might be part of the Chrome browser that is built and delivered by Google.
+ You can find more detailed information about the differences between Chromium and Chrome in this
+ \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.
+
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