diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:54:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:54:02 (GMT) |
| commit | 3e4d8596edd8061a81f641df4f09d018b73c81f0 (patch) | |
| tree | 9b474de460f44c65eba61b7b5b8c01dac22bf275 /tests/auto/qhttpsocketengine | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| parent | 62cd360b3f2ef9e9787359a9105fd805b721b49f (diff) | |
| download | Qt-3e4d8596edd8061a81f641df4f09d018b73c81f0.zip Qt-3e4d8596edd8061a81f641df4f09d018b73c81f0.tar.gz Qt-3e4d8596edd8061a81f641df4f09d018b73c81f0.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Provide overview for Symbian capabilities.
Fix QNX screen initialization
tst_qftp: Attempting to reproduce a crash
QNAM HTTP: Do not pipeline with WebLogic servers
Autotest: update path location on the test server
Autotest: update location of fluke.gif on test server
Make qsTr work in global scope
Not possible to show selected text in virtual keyboard
Fix typos, there is no QT_NO_SSL
Export .flm files always if they are different
Make qmake possible to build with mingw using qmake.pro
QS60Style: Single Click UI support for SD 9.2 time-box
Diffstat (limited to 'tests/auto/qhttpsocketengine')
| -rw-r--r-- | tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp index 3a3ea79..f86ba63 100644 --- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -641,7 +641,7 @@ void tst_QHttpSocketEngine::downloadBigFile() QByteArray hostName = QtNetworkSettings::serverName().toLatin1(); QVERIFY(tmpSocket->state() == QAbstractSocket::ConnectedState); - QVERIFY(tmpSocket->write("GET /mediumfile HTTP/1.0\r\n") > 0); + QVERIFY(tmpSocket->write("GET /qtest/mediumfile HTTP/1.0\r\n") > 0); QVERIFY(tmpSocket->write("Host: ") > 0); QVERIFY(tmpSocket->write(hostName.data()) > 0); QVERIFY(tmpSocket->write("\r\n") > 0); |