diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-04-01 13:47:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-04-01 13:47:08 (GMT) |
| commit | 5ed526bea6331055941360e01024a1a1af57feed (patch) | |
| tree | 0d9e081d40557c61b42657dc34f07bf9dc93f17b /src/network/access | |
| parent | c2ad3b2ab704b751f2900729892099a13ef200a0 (diff) | |
| parent | aaf765dfb797da6b72807fad61fd2a1d19187c0c (diff) | |
| download | Qt-5ed526bea6331055941360e01024a1a1af57feed.zip Qt-5ed526bea6331055941360e01024a1a1af57feed.tar.gz Qt-5ed526bea6331055941360e01024a1a1af57feed.tar.bz2 | |
Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 0141ae2..96ccc91 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -2120,6 +2120,10 @@ int QHttp::setUser(const QString &userName, const QString &password) Web proxy cache server (from \l http://www.squid.org/). For transparent proxying, such as SOCKS5, use QNetworkProxy instead. + \note setProxy() has to be called before setHost() for it to take effect. + If setProxy() is called after setHost(), then it will not apply until after + setHost() is called again. + \sa QFtp::setProxy() */ int QHttp::setProxy(const QString &host, int port, @@ -2139,7 +2143,7 @@ int QHttp::setProxy(const QString &host, int port, is QNetworkProxy::HttpCachingProxy, QHttp will behave like the previous function. - Note: for compatibility with Qt 4.3, if the proxy type is + \note for compatibility with Qt 4.3, if the proxy type is QNetworkProxy::HttpProxy and the request type is unencrypted (that is, ConnectionModeHttp), QHttp will treat the proxy as a caching proxy. |