diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 01:53:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 01:53:34 (GMT) |
| commit | c3e903409b96fede96cb4a7b95ba308663c88879 (patch) | |
| tree | 58d70c5c1a5af72aa5220b1132786e065cb56154 /src/network/access | |
| parent | 3840002c93cadb22a67b1f06475d5c1708f507df (diff) | |
| parent | 3290e4c1956bc6df63af669523391565c67e8c42 (diff) | |
| download | Qt-c3e903409b96fede96cb4a7b95ba308663c88879.zip Qt-c3e903409b96fede96cb4a7b95ba308663c88879.tar.gz Qt-c3e903409b96fede96cb4a7b95ba308663c88879.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add branch prediction macros
Add methods for traversing and combining QProcessEnvironment.
Handle the HTTP 418 reply properly in QNAM
absorb translations.pri into translations.pro
let generated flag control SQL generation
Add version attributes as per ODF specification
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 81410a4..16fd9bb 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -78,6 +78,11 @@ static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const code = QNetworkReply::ProxyAuthenticationRequiredError; break; + case 418: // I'm a teapot + code = QNetworkReply::ProtocolInvalidOperationError; + break; + + default: if (httpStatusCode > 500) { // some kind of server error |