diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 08:36:53 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 08:36:53 (GMT) |
| commit | 0e5fd6b280e597edd8b5884f38e7450891224846 (patch) | |
| tree | ddfbaf843a2b61ccc7d5ad84142050b919f8d0a2 | |
| parent | bb183e1bc4ca51da6c2df80b309b01f9fc304366 (diff) | |
| parent | 08dc54fe49288486b989bd8f823ecdbf3454d47e (diff) | |
| download | Qt-0e5fd6b280e597edd8b5884f38e7450891224846.zip Qt-0e5fd6b280e597edd8b5884f38e7450891224846.tar.gz Qt-0e5fd6b280e597edd8b5884f38e7450891224846.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 0e1ccf3..9d75fba 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -903,8 +903,12 @@ void tst_QTcpSocket::disconnectWhileConnecting() socket->disconnectFromHost(); } - connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); + connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); +#ifndef Q_OS_SYMBIAN enterLoop(10); +#else + enterLoop(30); +#endif QVERIFY2(!timeout(), "Network timeout"); QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { @@ -1060,7 +1064,11 @@ void tst_QTcpSocket::disconnectWhileLookingUp() // let anything queued happen QEventLoop loop; +#ifndef Q_OS_SYMBIAN QTimer::singleShot(50, &loop, SLOT(quit())); +#else + QTimer::singleShot(500, &loop, SLOT(quit())); +#endif loop.exec(); // recheck |