diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-10-26 13:48:42 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-10-27 12:40:28 (GMT) |
| commit | fb404765a5af559598dc5b3906e45d8c5e48884b (patch) | |
| tree | 4ed25dade61ffb29614dc31c8546f964ebb8158d /src/network/access/qnetworkaccesshttpbackend.cpp | |
| parent | 3b87e4639edb2c7050c5ae74fa8280fd120b8de1 (diff) | |
| download | Qt-fb404765a5af559598dc5b3906e45d8c5e48884b.zip Qt-fb404765a5af559598dc5b3906e45d8c5e48884b.tar.gz Qt-fb404765a5af559598dc5b3906e45d8c5e48884b.tar.bz2 | |
QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
Diffstat (limited to 'src/network/access/qnetworkaccesshttpbackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index 3bad2fe..3611e77 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -340,10 +340,6 @@ void QNetworkAccessHttpBackend::finished() void QNetworkAccessHttpBackend::setupConnection() { -#ifndef QT_NO_NETWORKPROXY - connect(http, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), - SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); -#endif connect(http, SIGNAL(authenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*,const QHttpNetworkConnection*)), SLOT(httpAuthenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*))); connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)), @@ -598,6 +594,10 @@ void QNetworkAccessHttpBackend::postRequest() connect(httpReply, SIGNAL(headerChanged()), SLOT(replyHeaderChanged())); connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)), SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*))); +#ifndef QT_NO_NETWORKPROXY + connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), + SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); +#endif } void QNetworkAccessHttpBackend::invalidateCache() |