summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-23 06:03:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-23 06:03:17 (GMT)
commit8960973e97713205d1aeb209806daca456c55111 (patch)
treede1541e307f870d1efbcf413346ef8e54032e077 /src/network/kernel
parent1e0530130a8d2afeecfa60bb898c055d15ff8a82 (diff)
parent951e46bc21168cb66780f932006ec41b7dfea234 (diff)
downloadQt-8960973e97713205d1aeb209806daca456c55111.zip
Qt-8960973e97713205d1aeb209806daca456c55111.tar.gz
Qt-8960973e97713205d1aeb209806daca456c55111.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkProxy documentation: mention usage of "http_proxy" variable
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qnetworkproxy.cpp6
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