diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-12 12:18:48 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-12 12:18:48 (GMT) |
| commit | d658662e742b57f60908ba3d935b0870e12d8963 (patch) | |
| tree | 6819e6af527e2f11473b99c7efca48b9faf529a1 /tests/auto/qhostinfo/tst_qhostinfo.cpp | |
| parent | e4bb34d51cc9f4f78abc17a0e715876b11d53ace (diff) | |
| parent | 7a9b580030208a806897146b4c0f1d8f0d9caaa4 (diff) | |
| download | Qt-d658662e742b57f60908ba3d935b0870e12d8963.zip Qt-d658662e742b57f60908ba3d935b0870e12d8963.tar.gz Qt-d658662e742b57f60908ba3d935b0870e12d8963.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qhostinfo/tst_qhostinfo.cpp')
| -rw-r--r-- | tests/auto/qhostinfo/tst_qhostinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index bf499ec..9943414 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -14,7 +14,7 @@ ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software +** General Public License version 2.1 as published by Free Software ** Foundation and appearing in the file LICENSE.LGPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements @@ -219,7 +219,7 @@ void tst_QHostInfo::lookupIPv4_data() #ifdef Q_OS_SYMBIAN // Test server lookup 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("literal_ip4") << QtNetworkSettings::serverIP().toString() << 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); |