diff options
author | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
---|---|---|
committer | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
commit | ad3e723c334d72b746979b284910ac9b698b2d0b (patch) | |
tree | 28fa320fcbd38938345f30817d75f19716c4e534 /tests/auto/qlocalsocket/tst_qlocalsocket.cpp | |
parent | c4d8d7fd35c8ac7fd2c14208e5e7ca0a35c101e1 (diff) | |
parent | 4cd683231190443e5243f66098c7322e3808a131 (diff) | |
download | Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.zip Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.gz Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.bz2 |
Merge commit 'origin/4.6' into large-file-support
Diffstat (limited to 'tests/auto/qlocalsocket/tst_qlocalsocket.cpp')
-rw-r--r-- | tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index be39d00..ab7b0ac 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -976,7 +976,7 @@ void tst_QLocalSocket::writeOnlySocket() #if defined(Q_OS_SYMBIAN) QTest::qWait(250); #endif - QVERIFY(server.waitForNewConnection()); + QVERIFY(server.waitForNewConnection(200)); QLocalSocket* serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); |