summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-27 05:10:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-27 05:10:43 (GMT)
commit696b55195f1ad40a077683dbc533c73baf1536ee (patch)
treef47c1302add4bc3dd1abb10742ea318bdf71199b
parent94df405ad87f61fba470773ea8bba204c355b368 (diff)
downloadQt-696b55195f1ad40a077683dbc533c73baf1536ee.zip
Qt-696b55195f1ad40a077683dbc533c73baf1536ee.tar.gz
Qt-696b55195f1ad40a077683dbc533c73baf1536ee.tar.bz2
Handle more HTML non-errors
-rw-r--r--src/declarative/qml/qmlxmlhttprequest.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index 642c6de..216db6e 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -1208,14 +1208,16 @@ void QmlXMLHttpRequest::error(QNetworkReply::NetworkError error)
m_request = QNetworkRequest();
destroyNetwork();
- if (error != QNetworkReply::ContentAccessDenied &&
- error != QNetworkReply::ContentOperationNotPermittedError &&
- error != QNetworkReply::ContentNotFoundError) {
- m_errorFlag = true;
- } else {
+ if (error == QNetworkReply::ContentAccessDenied ||
+ error == QNetworkReply::ContentOperationNotPermittedError ||
+ error == QNetworkReply::ContentNotFoundError ||
+ error == QNetworkReply::AuthenticationRequiredError ||
+ error == QNetworkReply::ContentReSendError) {
m_state = Loading;
dispatchCallback();
- }
+ } else {
+ m_errorFlag = true;
+ }
m_state = Done;
dispatchCallback();