diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
| commit | fc013b7be66a6d4fc13af8bd38b7e679ed3998af (patch) | |
| tree | cc068fa05bbc357bce89f8c6dfe37d6308704a1e /tests/auto/networkselftest/tst_networkselftest.cpp | |
| parent | be41c140594ccea16ce17ccca7251d614cc75e1e (diff) | |
| parent | 4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff) | |
| download | Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.zip Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.gz Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'tests/auto/networkselftest/tst_networkselftest.cpp')
| -rw-r--r-- | tests/auto/networkselftest/tst_networkselftest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp index ecbc08c..9486671 100644 --- a/tests/auto/networkselftest/tst_networkselftest.cpp +++ b/tests/auto/networkselftest/tst_networkselftest.cpp @@ -345,7 +345,7 @@ QHostAddress tst_NetworkSelfTest::serverIpAddress() // need resolving QHostInfo resolved = QHostInfo::fromName(QtNetworkSettings::serverName()); if(resolved.error() != QHostInfo::NoError || - !resolved.addresses().isEmpty()) { + resolved.addresses().isEmpty()) { qWarning("QHostInfo::fromName failed (%d).", resolved.error()); return QHostAddress(QHostAddress::Null); } |