diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
| commit | d70d17a8ebea25a836e0fb101796cb70d5ca5efd (patch) | |
| tree | 0029a39fd51caf709a0e0086dc3da3dbe21ad929 /tests/auto/qhttp/tst_qhttp.cpp | |
| parent | bbd87cfe022fab15a5cac555ce155f9caa27ff06 (diff) | |
| parent | 91f9b95b931f441e209ecb12c620e1657810f338 (diff) | |
| download | Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.zip Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.gz Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tests/auto/qhttp/tst_qhttp.cpp')
| -rw-r--r-- | tests/auto/qhttp/tst_qhttp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index f706228..61123c2 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -856,7 +856,7 @@ void tst_QHttp::proxy2() QTestEventLoop::instance().enterLoop(30); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(readyRead_ba.count("Welcome to fluke.troll.no"), 2); + QCOMPARE(readyRead_ba.count("Welcome to qt-test-server"), 2); readyRead_ba.clear(); } @@ -891,7 +891,7 @@ void tst_QHttp::proxy3() QTestEventLoop::instance().enterLoop(30); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(readyRead_ba.count("Welcome to fluke.troll.no"), 2); + QCOMPARE(readyRead_ba.count("Welcome to qt-test-server"), 2); readyRead_ba.clear(); } |