diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-10-27 12:06:28 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-10-27 12:40:29 (GMT) |
| commit | b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0 (patch) | |
| tree | d70c90f14ad4fd095142cdf034c67f2c23da4d52 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | be18016694c57fef508aa4715f5b8f9bbf21e5ac (diff) | |
| download | Qt-b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0.zip Qt-b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0.tar.gz Qt-b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0.tar.bz2 | |
QNAM HTTP: Remove the error() of QHttpNetworkConnection
Removed the distinction between reply error and connection error.
The QNetworkAccessManager was treating them the same way anyway.
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 3acaaff..92f8af7 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -377,8 +377,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket ? QNetworkReply::ProxyAuthenticationRequiredError : QNetworkReply::AuthenticationRequiredError; reply->d_func()->errorString = errorDetail(errorCode, socket); - emit q->error(errorCode, reply->d_func()->errorString); - emit channels[i].reply->finished(); + emit reply->finishedWithError(errorCode, reply->d_func()->errorString); // ### at this point the reply could be deleted socket->close(); return true; |