diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 10:31:34 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 10:31:34 (GMT) |
| commit | 0bb4ffa7c8e8a546d9e03304e61b440921d830c0 (patch) | |
| tree | 13e5661f329549fe9ba6509144ace4a2c2adf0e3 | |
| parent | a61f1978ec17120d3902e5ef7d625abb07d6c402 (diff) | |
| parent | efaf7e55bf31628e2fa020f44a8f0c8b63eb081a (diff) | |
| download | Qt-0bb4ffa7c8e8a546d9e03304e61b440921d830c0.zip Qt-0bb4ffa7c8e8a546d9e03304e61b440921d830c0.tar.gz Qt-0bb4ffa7c8e8a546d9e03304e61b440921d830c0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qsslsocket/tst_qsslsocket.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 67c7485..b62d629 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1283,7 +1283,11 @@ protected: // delayed acceptance: QTest::qSleep(100); - server.waitForNewConnection(2000); +#ifndef Q_OS_SYMBIAN + bool ret = server.waitForNewConnection(2000); +#else + bool ret = server.waitForNewConnection(20000); +#endif // delayed start of encryption QTest::qSleep(100); @@ -1329,7 +1333,6 @@ protected: void tst_QSslSocket::waitForMinusOne() { -QSKIP("App stucks here if synchornized socket operations in use", SkipAll); QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; |