diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt index 3efec91e96..3e5dab63e0 100644 --- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt @@ -15,6 +15,6 @@ qt_internal_add_test(tst_qnetworkinterface SOURCES tst_qnetworkinterface.cpp LIBRARIES - Qt::Network + Qt::NetworkPrivate QT_TEST_SERVER_LIST "apache2" ) diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 9f33cce509..b57a83f5df 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -11,6 +11,8 @@ #include #include "../../../network-settings.h" +#include + Q_DECLARE_METATYPE(QHostAddress) class tst_QNetworkInterface : public QObject @@ -48,14 +50,13 @@ tst_QNetworkInterface::~tst_QNetworkInterface() bool tst_QNetworkInterface::isIPv6Working() { - // 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 + // QNetworkInterface may be unable to detect IPv6 addresses even if they + // are there, due to limitations of the implementation. + if (QOperatingSystemVersion::currentType() == QOperatingSystemVersion::Windows || + QT_CONFIG(linux_netlink) || (QT_CONFIG(getifaddrs) && QT_CONFIG(ipv6ifname))) { + return QtNetworkSettings::hasIPv6(); + } + return false; } void tst_QNetworkInterface::initTestCase()