diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-15 23:06:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-15 23:06:48 +0100 |
| commit | f91225335a0cfab6ce4b37c41af2eb3067f7d11e (patch) | |
| tree | 97a8327cec2e85e88d1c8e61cf485a4919bf947d /src/webengine | |
| parent | 53d586000b6ea002d96da0a2cb30d26a61c46635 (diff) | |
| parent | aa6294a3918b5e74b549cb483c83371c896a09cc (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I1f2068d52104764a1ac75354cbe7d90f6293ec7d
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 6995be2fa..c3d737384 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 49.0.2623.111, with + This version of Qt WebEngine is based on Chromium version 53.0.2785.148, with additional security fixes from newer versions. \section2 Qt WebEngine Process @@ -199,7 +199,7 @@ Qt WebEngine uses the proxy settings from \l{Qt Network}. If QNetworkProxy::applicationProxy is set, it will also be used for Qt WebEngine, and if - QNetworkProxy::usesSystemConfiguration() is enabled, the proxy settings are automatically + QNetworkProxyFactory::usesSystemConfiguration() is enabled, the proxy settings are automatically retrieved from the system. Settings from an installed QNetworkProxyFactory will be ignored though. |