diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-21 15:07:24 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-22 10:48:55 (GMT) |
| commit | 951e46bc21168cb66780f932006ec41b7dfea234 (patch) | |
| tree | 38ff242fac133ad74025e68bcede27245712540a /src/network/kernel | |
| parent | 2ec828a2baa35725bedb56a2611e817a6c2d875e (diff) | |
| download | Qt-951e46bc21168cb66780f932006ec41b7dfea234.zip Qt-951e46bc21168cb66780f932006ec41b7dfea234.tar.gz Qt-951e46bc21168cb66780f932006ec41b7dfea234.tar.bz2 | |
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
(cherry picked from commit ac22fa8a33472cbdd85ef312c436442a93959ab3)
Diffstat (limited to 'src/network/kernel')
| -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 71d61a4..4167b6d 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1384,9 +1384,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 |