diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-12-13 11:02:52 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:07 (GMT) |
| commit | b10d3383b8dcfafae5adad2f373cc986cc3e66cf (patch) | |
| tree | f0170e50772e4152f10699a46699b8eddff507c9 /src/network/kernel | |
| parent | 3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac (diff) | |
| download | Qt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.zip Qt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.tar.gz Qt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.tar.bz2 | |
Various qt documentation fixes (wk 42)
Fixes for bugs: QTBUG-8673, QTBUG-18101, QTBUG-14194, QTBUG-9109,
QTBUG-8331, QTBUG-8329, QTBUG-8786, QTBUG-8787, QTBUG-21295,
QTBUG-14554, QTBUG-19367, QTBUG-8323, QTBUG-9466, QTBUG-7924
and QTBUG-20355.
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 d3e4c94..c097ed9 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -129,9 +129,9 @@ \value NoProxy No proxying is used \value DefaultProxy Proxy is determined based on the application proxy set using setApplicationProxy() \value Socks5Proxy \l Socks5 proxying is used - \value HttpProxy HTTP transparent proxying is used - \value HttpCachingProxy Proxying for HTTP requests only - \value FtpCachingProxy Proxying for FTP requests only + \value HttpProxy HTTP transparent proxying is used (This value was introduced in 4.3.) + \value HttpCachingProxy Proxying for HTTP requests only (This value was introduced in 4.4.) + \value FtpCachingProxy Proxying for FTP requests only (This value was introduced in 4.4.) The table below lists different proxy types and their capabilities. Since each proxy type has different capabilities, it |