diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-11 06:06:36 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-11 06:06:36 (GMT) |
| commit | 5b80fbad54eccfc79f38c4f24d6267834b23e742 (patch) | |
| tree | 3f79df094e466fe61e0fe8783275396ad0553475 /tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | |
| parent | 43d7bec69c7eb42b2c86d3f3b716245e069865e9 (diff) | |
| download | Qt-5b80fbad54eccfc79f38c4f24d6267834b23e742.zip Qt-5b80fbad54eccfc79f38c4f24d6267834b23e742.tar.gz Qt-5b80fbad54eccfc79f38c4f24d6267834b23e742.tar.bz2 | |
Unified QtNetworkSettings:severIP return type for all platforms.
This commit fixes the following autotest case build breaks on
windows when compiling QtS60 sources:
- q3socket
- q3socketdevice
- qhostinfo
- qsocks5socketengine
Diffstat (limited to 'tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp')
| -rw-r--r-- | tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp index 4287a16..0245e95 100644 --- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -306,11 +306,11 @@ void tst_QHttpSocketEngine::simpleConnectToIMAP() socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128)); - QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)); + QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143)); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState); QVERIFY(socketDevice.waitForWrite()); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState); - QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP())); + QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP()); QVERIFY(!socketDevice.localAddress().isNull()); QVERIFY(socketDevice.localPort() > 0); @@ -695,11 +695,11 @@ void tst_QHttpSocketEngine::passwordAuth() socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128, "qsockstest", "password")); - QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)); + QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143)); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState); QVERIFY(socketDevice.waitForWrite()); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState); - QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP())); + QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP()); // Wait for the greeting QVERIFY(socketDevice.waitForRead()); |