summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-22 13:24:16 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-22 13:24:16 (GMT)
commit6a17647e7ac5a498f8495de434b946632172f291 (patch)
tree680eb720b39ac2a0711c5aa05ccd502fa19f179d /tests
parent1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5 (diff)
parent394fddbe1ed93f8aafc29ace8217ad8d77e7276f (diff)
downloadQt-6a17647e7ac5a498f8495de434b946632172f291.zip
Qt-6a17647e7ac5a498f8495de434b946632172f291.tar.gz
Qt-6a17647e7ac5a498f8495de434b946632172f291.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index e1e25d2..470e57f 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -320,6 +320,7 @@ void tst_QHttpNetworkConnection::put()
QByteArray array = data.toLatin1();
QNonContiguousByteDevice *bd = QNonContiguousByteDeviceFactory::create(&array);
+ bd->setParent(this);
request.setUploadByteDevice(bd);
finishedCalled = false;
@@ -411,6 +412,7 @@ void tst_QHttpNetworkConnection::post()
QByteArray array = data.toLatin1();
QNonContiguousByteDevice *bd = QNonContiguousByteDeviceFactory::create(&array);
+ bd->setParent(this);
request.setUploadByteDevice(bd);
QHttpNetworkReply *reply = connection.sendRequest(request);