summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp8
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 06432ae3..eb359e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,6 @@ bin/pixeltool*
bin/qmake*
bin/qdoc3*
bin/qt3to4*
-bin/qtdemo*
bin/qttracereplay*
bin/rcc*
bin/uic*
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index a8ab5b85..16c173d2 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -76,10 +76,14 @@ void tst_QPacketProtocol::init()
QVERIFY(m_server->listen(QHostAddress("127.0.0.1")));
m_client = new QTcpSocket(this);
+
+ QSignalSpy serverSpy(m_server, SIGNAL(newConnection()));
+ QSignalSpy clientSpy(m_client, SIGNAL(connected()));
+
m_client->connectToHost(m_server->serverAddress(), m_server->serverPort());
- QVERIFY(m_client->waitForConnected());
- QVERIFY(m_server->waitForNewConnection());
+ QVERIFY(clientSpy.count() > 0 || clientSpy.wait());
+ QVERIFY(serverSpy.count() > 0 || serverSpy.wait());
m_serverConn = m_server->nextPendingConnection();
}