diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-15 16:36:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-15 16:37:11 (GMT) |
| commit | f8788e4202e51fb36b3dcb4a80c83e16ff389150 (patch) | |
| tree | 948c5dde798bf9071c0f205069840d3970ec5432 /tests | |
| parent | fea180d80112faa1a314e240ab07c37e4c2e0d1d (diff) | |
| download | Qt-f8788e4202e51fb36b3dcb4a80c83e16ff389150.zip Qt-f8788e4202e51fb36b3dcb4a80c83e16ff389150.tar.gz Qt-f8788e4202e51fb36b3dcb4a80c83e16ff389150.tar.bz2 | |
Fix building of tst_QTcpSocket
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index d195d3c..31cae40 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -549,7 +549,7 @@ void tst_QTcpSocket::timeoutConnect_data() { QTest::addColumn<QString>("address"); QTest::newRow("host") << QtNetworkSettings::serverName(); - QTest::newRow("ip") << QtNetworkSettings::serverIP(); + QTest::newRow("ip") << QtNetworkSettings::serverIP().toString(); } void tst_QTcpSocket::timeoutConnect() @@ -571,7 +571,7 @@ void tst_QTcpSocket::timeoutConnect() socket->connectToHost(address, 1357); QVERIFY(timer.elapsed() < 50); QTimer::singleShot(50, &QTestEventLoop::instance(), SLOT(exitLoop())); - QTestEventLoop::enterLoop(5); + QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(socket->state() == QTcpSocket::ConnectingState || socket->state() == QTcpSocket::HostLookupState); |