Merge commit 'qt/master'

Conflicts:
	examples/painting/svgviewer/files/bubbles.svg
	src/corelib/kernel/qobject.cpp
	src/network/kernel/qhostinfo.cpp
	tests/auto/qhostinfo/tst_qhostinfo.cpp

1 files changed, 12 insertions, 1 deletions

diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp
index 693e1f4..8b2c4e9 100644
--- a/src/network/access/qhttpnetworkrequest.cpp
+++ b/src/network/access/qhttpnetworkrequest.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op,
         QHttpNetworkRequest::Priority pri, const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(0),
-      autoDecompress(false)
+      autoDecompress(false), pipeliningAllowed(false)
 {
 }
 
@@ -60,6 +60,7 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(const QHttpNetworkRequest
     priority = other.priority;
     uploadByteDevice = other.uploadByteDevice;
     autoDecompress = other.autoDecompress;
+    pipeliningAllowed = other.pipeliningAllowed;
 }
 
 QHttpNetworkRequestPrivate::~QHttpNetworkRequestPrivate()
@@ -239,6 +240,16 @@ void QHttpNetworkRequest::setPriority(Priority priority)
     d->priority = priority;
 }
 
+bool QHttpNetworkRequest::isPipeliningAllowed() const
+{
+    return d->pipeliningAllowed;
+}
+
+void QHttpNetworkRequest::setPipeliningAllowed(bool b)
+{
+    d->pipeliningAllowed = b;
+}
+
 void QHttpNetworkRequest::setUploadByteDevice(QNonContiguousByteDevice *bd)
 {
     d->uploadByteDevice = bd;