diff options
| author | axis <qt-info@nokia.com> | 2009-05-20 13:44:05 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-20 13:44:05 +0200 |
| commit | 91e041fcff000024e619de5d7561ce141cb99d99 (patch) | |
| tree | 0fc7285a4a1634f6a74499c324d00b6aef181974 /tests/auto/qiodevice | |
| parent | d68629e4cfb94776b8ef02cd01cf0b02bf430db8 (diff) | |
| parent | 25f86fbab2e7d23832b0bb8ae8530289258e2aa5 (diff) | |
| download | qt4-tools-91e041fcff000024e619de5d7561ce141cb99d99.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
Diffstat (limited to 'tests/auto/qiodevice')
| -rw-r--r-- | tests/auto/qiodevice/tst_qiodevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 38eac55370..dee37dce0c 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -138,7 +138,7 @@ void tst_QIODevice::constructing_QTcpSocket() QCOMPARE(socket.pos(), qlonglong(0)); socket.close(); - socket.connectToHost("imap.troll.no", 143); + socket.connectToHost(QtNetworkSettings::serverName(), 143); QVERIFY(socket.waitForConnected(5000)); QVERIFY(device->isOpen()); |