summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2016-01-08 13:03:31 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2016-01-15 15:32:51 +0000
commit1ad2e1b809b31ef21a34674590a2d55c49bd3468 (patch)
tree56bf68eb1af7547636aa32b37e5e43675cef48b5 /src
parent320504179eb5b7b8c52e54ea97c930ee7d8c1ae6 (diff)
Doc: Document support for proxies
Change-Id: Icde2ed5519fe27d7b69d89e1c734d466cf65dfe3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 50d03a9f4..53ff4b462 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -138,6 +138,15 @@
handled by using the WebEngineView::certificateError QML method or by reimplementing the
QWebEnginePage::certificateError function.
+ \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.
+
+ If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted.
+ For Qt Quick, a dialog is shown.
+
\section1 Using WebEngine Core
Qt WebEngine Core provides an API shared by Qt WebEngine and Qt WebEngine Widgets for handling