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/qhostinfo | |
| 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/qhostinfo')
| -rw-r--r-- | tests/auto/qhostinfo/tst_qhostinfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index f4ad307..06fdf7b 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -92,6 +92,8 @@ //TESTED_CLASS= //TESTED_FILES= +const char * const lupinellaIp = "10.3.4.6"; + class tst_QHostInfo : public QObject { @@ -216,8 +218,8 @@ void tst_QHostInfo::lookupIPv4_data() #ifdef Q_OS_SYMBIAN // Test server lookup - QTest::newRow("lookup_01") << QtNetworkSettings::serverName() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError); - QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError); + QTest::newRow("lookup_01") << QtNetworkSettings::serverName() << QtNetworkSettings::serverIP().toString() << int(QHostInfo::NoError); + QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP() << QtNetworkSettings::serverIP().toString() << int(QHostInfo::NoError); QTest::newRow("multiple_ip4") << "multi.dev.troll.no" << "1.2.3.4 1.2.3.5 10.3.3.31" << int(QHostInfo::NoError); #else QTest::newRow("empty") << "" << "" << int(QHostInfo::HostNotFound); |