summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-05-05 12:15:17 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-05-05 12:15:17 (GMT)
commit5791fde8526afc49cdbeee080ead9e8a305e3cd5 (patch)
treecda5018b0e0a3fab6f9d4757f80cffdec566b980 /tests
parent649b31e1222f551021739f71a5cc468f7df80e1c (diff)
parenta3d08c254820f0d57e72929ddbd2d1b572060fe7 (diff)
downloadQt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.zip
Qt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.tar.gz
Qt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qiodevice/tst_qiodevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp
index f55c659..38eac55 100644
--- a/tests/auto/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/qiodevice/tst_qiodevice.cpp
@@ -124,7 +124,7 @@ void tst_QIODevice::constructing_QTcpSocket()
QVERIFY(!device->isOpen());
- socket.connectToHost(FTP_TEST_SERVER_NAME_1, 21);
+ socket.connectToHost(QtNetworkSettings::serverName(), 21);
QVERIFY(socket.waitForConnected(5000));
QVERIFY(device->isOpen());