Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	doc/src/classes/qnamespace.qdoc
	examples/examples.pro
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qobject.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qstandardgestures.h
	src/gui/kernel/qwidget.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 0982685..27c5860 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -149,6 +149,7 @@ private:
     Q_DECLARE_SCOPED_PRIVATE(QHttpNetworkReply)
     friend class QHttpNetworkConnection;
     friend class QHttpNetworkConnectionPrivate;
+    friend class QHttpNetworkConnectionChannel;
 };
 
 
@@ -171,6 +172,10 @@ public:
     qint64 readReplyBodyChunked(QIODevice *in, QByteDataBuffer *out);
     qint64 getChunkSize(QIODevice *in, qint64 *chunkSize);
 
+    void appendUncompressedReplyData(QByteArray &qba);
+    void appendUncompressedReplyData(QByteDataBuffer &data);
+    void appendCompressedReplyData(QByteDataBuffer &data);
+
     qint64 bytesAvailable() const;
     bool isChunked();
     bool connectionCloseEnabled();