diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-31 19:07:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-31 19:07:33 (GMT) |
| commit | 4d53a691aaac9789ddd4f9d4e968d28ace2181ca (patch) | |
| tree | c33106c1a9906cb2a7955ace3a6f3c665f1f55d9 | |
| parent | 34ea4da9a3c5538f39408367b394044fbd303773 (diff) | |
| parent | 7dfb420b99180e61efc1b089f47932ac07a4bf36 (diff) | |
| download | Qt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.zip Qt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.tar.gz Qt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed networkselftest failing to resolve hostname
| -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); } |