summaryrefslogtreecommitdiffstats
path: root/src/core/proxy_config_service_qt.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Introduce ProxyResolverQt"Pierre Rossi2015-08-191-13/+1
| | | | | | | | | This reverts commit 0e006b8ea755ebad01faf3e747e61abdf158289a. The workaround is not needed anymore since the v8 proxy resolver is now used by default. Change-Id: Ifea4ca6c6a0b0442cc1d8d22b1eb1553f3319524 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Avoid assert in proxy resolutionAllan Sandfeld Jensen2015-07-011-0/+2
| | | | | | | | QtWebEngine triggers asserts on Windows due to OnProxyConfigChanged called with a still pending configuration. Change-Id: I835860507c17110e642f3fa0628b5f7cb531e0e4 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Introduce ProxyResolverQtPierre Rossi2015-06-081-1/+13
| | | | | | | | | | | This allows using QtNetwork's proxy auto conf detection code from QNetworkProxyFactory, by setting the QTWEBENGINE_USE_QT_PROXYRESOLVER environment variable. Otherwise, we still rely on chromium's implementation. Task-number: QTBUG-45376 Change-Id: I7b8b77c932060ad36090d388d616b713d93cad0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Support QNetworkProxy::applicationProxyPierre Rossi2015-05-291-0/+171
Implement a ProxyConfigService that keeps track of the state of Qt's application proxy which, if set, takes precedence over the system settings. Change-Id: I7f1eba9015b70cf90f53a41736dd0a6d0ad28489 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>