summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-09 01:38:00 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-09 01:38:00 (GMT)
commit64d94b747dfa2448d9ba0157fc2a44c13cf4b1d5 (patch)
treefb494a9c41d891c66f357450de1b79b41d7fa583
parent7e202bca9d21a70588e726e63abae6c9cb369fa8 (diff)
parente8052532978994888a9f6cbff5e7d70555cb39b8 (diff)
downloadQt-64d94b747dfa2448d9ba0157fc2a44c13cf4b1d5.zip
Qt-64d94b747dfa2448d9ba0157fc2a44c13cf4b1d5.tar.gz
Qt-64d94b747dfa2448d9ba0157fc2a44c13cf4b1d5.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-rw-r--r--tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index b54f133..60631d2 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -80,11 +80,12 @@ private slots:
void tst_QPacketProtocol::init()
{
m_server = new QTcpServer(this);
- QVERIFY(m_server->listen());
-
+ m_serverConn = 0;
+ QVERIFY(m_server->listen(QHostAddress("127.0.0.1")));
+
m_client = new QTcpSocket(this);
m_client->connectToHost(m_server->serverAddress(), m_server->serverPort());
-
+
QVERIFY(m_client->waitForConnected());
QVERIFY(m_server->waitForNewConnection());
m_serverConn = m_server->nextPendingConnection();