diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /tests/auto/qnetworkreply/tst_qnetworkreply.cpp | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'tests/auto/qnetworkreply/tst_qnetworkreply.cpp')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 6c77f11d03..d1dc62bbf4 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -4103,6 +4103,7 @@ void tst_QNetworkReply::ioPostToHttpFromMiddleOfQBufferFiveBytes() QUrl url = "http://" + QtNetworkSettings::serverName() + "/qtest/protected/cgi-bin/md5sum.cgi"; QNetworkRequest request(url); + request.setRawHeader("Content-Type", "application/octet-stream"); QNetworkReplyPtr reply = manager.post(request, &uploadBuffer); connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); @@ -4359,6 +4360,7 @@ void tst_QNetworkReply::ioPostToHttpUploadProgress() // create the request QUrl url = QUrl(QString("http://127.0.0.1:%1/").arg(server.serverPort())); QNetworkRequest request(url); + request.setRawHeader("Content-Type", "application/octet-stream"); QNetworkReplyPtr reply = manager.post(request, &sourceFile); QSignalSpy spy(reply, SIGNAL(uploadProgress(qint64,qint64))); connect(&server, SIGNAL(newConnection()), &QTestEventLoop::instance(), SLOT(exitLoop())); |