summaryrefslogtreecommitdiffstats
path: root/src/core/proxy_config_service_qt.h
Commit message (Collapse)AuthorAgeFilesLines
* Rebasing on Chromium 45Allan Sandfeld Jensen2015-08-251-1/+1
| | | | | | | Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Support QNetworkProxy::applicationProxyPierre Rossi2015-05-291-0/+87
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>