diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
| commit | 07cee1caa5238a9c4a132b6e37a0ef82b665c568 (patch) | |
| tree | 0c32d805837dc734b813ca76741a744a4c637a2c /tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp | |
| parent | b23dc7fb8bc8de6617684249411b5399f1d06631 (diff) | |
| parent | 662494c7a20d6612948a672e5e9c87b9173d9560 (diff) | |
| download | Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.zip Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.gz Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp')
| -rw-r--r-- | tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp index 74f09d0..2083b26 100644 --- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -319,7 +319,6 @@ void tst_QSocks5SocketEngine::simpleConnectToIMAP() socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080)); - // Connect to imap.trolltech.com's IP QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState); QVERIFY(socketDevice.waitForWrite()); @@ -902,7 +901,6 @@ void tst_QSocks5SocketEngine::passwordAuth2() socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1081)); socketDevice.setReceiver(this); - // Connect to imap.trolltech.com's IP QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState); while (socketDevice.state() == QAbstractSocket::ConnectingState) { |