diff options
| author | Hu Jialun <hujialun@comp.nus.edu.sg> | 2022-04-01 02:11:19 +0800 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-04-01 19:09:09 +0000 |
| commit | eff8f9b7fafab9bff9c525b077761569069ea83d (patch) | |
| tree | 2132b4f431c215f242eb393f30520ed14ef19aeb /src/network/kernel | |
| parent | e4380b90ea86a678edc54a5c7d333e44c3350791 (diff) | |
Doc: QNetworkProxyFactory: Mention libproxy in systemProxyForQuery
Documentation of QNetworkProxyFactory::systemProxyForQuery does not
include the libproxy integration, and may be misleading by hinting that
desktop environment integrations on other systems are unsupported.
Add this piece of information to the documentation to avoid
misunderstanding.
Pick-to: 6.3 6.2
Change-Id: Id3f14d4a617c25576cb1bd57a494ea77c882635d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 3a8169d249..8cecbc2582 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1507,6 +1507,11 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact SOCKS server for all queries. If SOCKS isn't enabled, it will use the HTTPS proxy for all TcpSocket and UrlRequest queries. + On systems configured with libproxy support, this function will + rely on libproxy to obtain the proxy settings. Depending on + libproxy configurations, this can in turn delegate to desktop + settings, environment variables, etc. + On other systems, this function will pick up proxy settings from the "http_proxy" environment variable. This variable must be a URL using one of the following schemes: "http", "socks5" or "socks5h". |