Merge remote branch 'earth/master' into symbian-socket-engine

Conflicts:
	src/network/access/qhttpnetworkconnectionchannel.cpp
	src/network/socket/qlocalsocket.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/bwins/QtTestu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def

1 files changed, 17 insertions, 1 deletions

diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index 42bb069..f7c5ca1 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -58,6 +58,7 @@ public:
     tst_QNetworkAccessManager_And_QProgressDialog();
 private slots:
     void downloadCheck();
+    void downloadCheck_data();
 };
 
 class DownloadCheckWidget : public QWidget
@@ -72,9 +73,14 @@ public:
         QMetaObject::invokeMethod(this, "go", Qt::QueuedConnection);
     }
     bool lateReadyRead;
+    bool zeroCopy;
 public slots:
     void go()
     {
+        QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile"));
+        if (zeroCopy)
+            request.setAttribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute, 10*1024*1024);
+                
         QNetworkReply *reply = netmanager.get(
                 QNetworkRequest(
                 QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile")
@@ -106,20 +112,30 @@ public slots:
         QTestEventLoop::instance().exitLoop();
     }
 
-
 private:
     QProgressDialog progressDlg;
     QNetworkAccessManager netmanager;
 };
 
+
 tst_QNetworkAccessManager_And_QProgressDialog::tst_QNetworkAccessManager_And_QProgressDialog()
 {
     Q_SET_DEFAULT_IAP
 }
 
+void tst_QNetworkAccessManager_And_QProgressDialog::downloadCheck_data()
+{
+    QTest::addColumn<bool>("useZeroCopy");
+    QTest::newRow("with-zeroCopy") << true;
+    QTest::newRow("without-zeroCopy") << false;
+}
+
 void tst_QNetworkAccessManager_And_QProgressDialog::downloadCheck()
 {
+    QFETCH(bool, useZeroCopy);
+
     DownloadCheckWidget widget;
+    widget.zeroCopy = useZeroCopy;
     widget.show();
     // run and exit on finished()
     QTestEventLoop::instance().enterLoop(10);