diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-11-28 10:15:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 18:06:51 +0100 |
| commit | 3826203f744a2147bebf5f088de0d524156f59fd (patch) | |
| tree | e02da15a659c9ac7361f7b07faaec3c104c26a63 /src/network/kernel/qnetworkproxy.cpp | |
| parent | 70170a1c32fc32832359fec14e1e1af7a1968fe9 (diff) | |
| download | qt4-tools-3826203f744a2147bebf5f088de0d524156f59fd.tar.gz | |
Various Qt documentation bug fixes (wk 42)
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@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 a81eb84d7c..7a7b455611 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 |