summaryrefslogtreecommitdiffstats
path: root/src/core/proxy_config_service_qt.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add LICENSE.ChromiumKai Koehne2017-09-201-1/+1
| | | | | | | | | The mentioned LICENSE file is not available; add it under the name LICENSE.Chromium. Task-number: QTBUG-60006 Change-Id: Ib2b3cb64467046c7ba1f53b0bbe14c3ec5a5291d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix reorder warning in proxy_config_service_qt.cppPeter Varga2017-07-311-2/+2
| | | | | | Task-number: QTBUG-61910 Change-Id: I894d1f180ba9952213b6f67a2445aa927dfd7e9b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Avoid default handler in switchKai Koehne2017-07-271-1/+1
| | | | | Change-Id: I4533e28a2c1a338abdb1d373a0a3bfe598a5edce Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix logic to check for proxy settingsKai Koehne2017-07-251-34/+58
| | | | | | | | | | | | | | | | | | | The previous code tried to find out whether a user has set an application proxy by checking the type of the applicationProxy. This is wrong, because a system proxy will actually also change the applicationProxy type. Instead, we now rely on QNetworkProxyFactory::usesSystemConfiguration to decide whether to use QtNetwork's application proxy, or Chromium's logic for the system proxy. We also save the state of QNetworkProxy::useSystemConfiguration to be able to track changes. [ChangeLog][Networking] Fixed an issue where system proxy settings were not picked up correctly. Task-number: QTBUG-61910 Change-Id: I1d9af3f6006ba187266fe50c645f425a46632e41 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 56Allan Sandfeld Jensen2017-03-271-2/+2
| | | | | Change-Id: I78240d7956de4716757761fc6517f031b4adb822 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Build with Qt 5.6Allan Sandfeld Jensen2016-11-171-0/+2
| | | | | | | Make minimal changes so QtWebEngineCore 5.8 still builds with Qt LTR. Change-Id: Iae3ae606b3457a6ca311ae174b3d2a331e9b20bc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Only use system proxy if QNetworkProxy::useSystemConfiguration() says soKai Koehne2016-11-091-1/+2
| | | | | | | | | This allows users to disable _any_ proxy globally by calling QNetworkProxy::setUseSystemConfiguration(false). Change-Id: If6f5d978316b603c53520512dac1eac57ab6c176 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Adaptations to Chromium 52Allan Sandfeld Jensen2016-09-141-1/+1
| | | | | Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| * Do not use proxy when connecting to localhostErwin Kandler2016-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | Chromium does not exclude localhost connection from its proxy rules by default. When using a qt proxy with any other form of qt-based connections, connections to localhost are excluded by default. This patch adds localhost connections to the proxy-bypass rules. Change-Id: I76c43a2ae0de8d8fad455445a64a739c6c6b40f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Unify license header usage.Jani Heikkinen2016-02-011-11/+14
| | | | | | | | | | | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-2/+2
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 05:18:56 +0000