summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc/src/qtwebengine-overview.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc')
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index d5b7d40a0..273d32861 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -197,9 +197,11 @@
\section1 Proxy Support
- If QNetworkProxy::applicationProxy is set, it will also be used for Qt WebEngine. Otherwise,
- Qt WebEngine automatically picks up the proxy configuration from OS X and Windows. On Linux,
- it acknowledges settings from KDE and Gnome.
+ 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
+ retrieved from the system. Settings from an installed QNetworkProxyFactory will be ignored
+ though.
If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted.
For Qt Quick, a dialog is shown.