diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-18 16:56:06 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-18 16:56:06 +0100 |
| commit | 440fbed83646f16bf002749f7cecf6ad6fc59bbf (patch) | |
| tree | 231874f011a96d23061822d97bf70f52fc23617d /src/webengine/doc | |
| parent | bc315ce05298cf500f45f3a897b0f7c0408fd611 (diff) | |
| parent | c506d1d867f827dbff405d8e789ab4810410079a (diff) | |
Merge branch '5.6' into dev
Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
Diffstat (limited to 'src/webengine/doc')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 9 |
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 ca60fedc2..e0c1110b3 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 |