diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 22:09:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 22:09:23 (GMT) |
commit | 0242f458be0a8ed4693606ba853f75c1e656821c (patch) | |
tree | 9b7f4bdc58e778499e67172c992edf23bd7ca3a3 /src/network/access/qhttpnetworkreply_p.h | |
parent | 1f556d6059472466d0437094af6c9a669b6331e4 (diff) | |
parent | dbd6d9d6b46b37f13482dea9edfe40772a2aaab6 (diff) | |
download | Qt-0242f458be0a8ed4693606ba853f75c1e656821c.zip Qt-0242f458be0a8ed4693606ba853f75c1e656821c.tar.gz Qt-0242f458be0a8ed4693606ba853f75c1e656821c.tar.bz2 |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
On symbian QMessageBox does not look like native dialog
HTTP internals: continue gzip decompression if buffer fills exactly
HTTP internals: do not discard data if not receiving gzip end marker
Support partial input mode - documentation update
Add a null check for the backend in QNetworkReplyImpl.
Support partial input mode
Diffstat (limited to 'src/network/access/qhttpnetworkreply_p.h')
-rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 05feaa9..365308f 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -200,6 +200,7 @@ public: #ifndef QT_NO_COMPRESS bool gzipCheckHeader(QByteArray &content, int &pos); int gunzipBodyPartially(QByteArray &compressed, QByteArray &inflated); + void gunzipBodyPartiallyEnd(); #endif void removeAutoDecompressHeader(); |