diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-21 16:07:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 17:23:42 +0100 |
| commit | ac22fa8a33472cbdd85ef312c436442a93959ab3 (patch) | |
| tree | 277af4df757ca75f51afd9236184ade5d8b4d8bf /src/network/kernel/qnetworkproxy.cpp | |
| parent | 479f3c6b1124bc830ee60e764ea50d14db526f7e (diff) | |
QNetworkProxy documentation: mention usage of "http_proxy" variable
This is done on systems other than Windows or Mac.
Change-Id: I631ea350cb9bc123edc6df33b6f661afa8f0778b
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
Diffstat (limited to 'src/network/kernel/qnetworkproxy.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 6beb52c5b0..9626a29997 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1376,9 +1376,9 @@ 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 other systems, there is no standardised method of obtaining the - system proxy configuration. This function may be improved in - future versions to support those systems. + 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". \section1 Limitations |