diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network-settings.h | 4 | ||||
| -rw-r--r-- | tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index d261c4afb5..99a30f51f7 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -118,6 +118,7 @@ public: static bool hasIPv6() { #ifdef Q_OS_UNIX + #if !defined(QT_NO_GETIFADDRS) && !defined(QT_NO_IPV6IFNAME) int s = ::socket(AF_INET6, SOCK_DGRAM, 0); if (s == -1) return false; @@ -132,6 +133,9 @@ public: } } ::close(s); + #else + return false; + #endif #endif return true; } diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index e18c50afbd..b5beee5499 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -71,9 +71,14 @@ tst_QNetworkInterface::~tst_QNetworkInterface() bool tst_QNetworkInterface::isIPv6Working() { - QUdpSocket socket; - socket.connectToHost(QHostAddress::LocalHostIPv6, 1234); - return socket.state() == QAbstractSocket::ConnectedState || socket.waitForConnected(100); + // Version without following cannot get IPV6 information + #if !defined(QT_NO_GETIFADDRS) && !defined(QT_NO_IPV6IFNAME) + QUdpSocket socket; + socket.connectToHost(QHostAddress::LocalHostIPv6, 1234); + return socket.state() == QAbstractSocket::ConnectedState || socket.waitForConnected(100); + #else + return false; + #endif } void tst_QNetworkInterface::initTestCase() |