diff options
| -rw-r--r-- | src/network/configure.cmake | 6 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index f24f739ce20..8a9ad6b614f 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -209,16 +209,16 @@ connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents, &con qt_feature("getifaddrs" PUBLIC LABEL "getifaddrs()" - CONDITION TEST_getifaddrs + CONDITION UNIX AND NOT QT_FEATURE_linux_netlink AND TEST_getifaddrs ) qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1") qt_feature("ifr_index" PRIVATE LABEL "ifr_index" - CONDITION TEST_ifr_index + CONDITION UNIX AND NOT QT_FEATURE_linux_netlink AND TEST_ifr_index ) qt_feature("ipv6ifname" PUBLIC LABEL "IPv6 ifname" - CONDITION TEST_ipv6ifname + CONDITION UNIX AND NOT QT_FEATURE_linux_netlink AND TEST_ipv6ifname ) qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1") qt_feature("libresolv" PRIVATE diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index d5f2bfbac44..98e9ec803ed 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -17,19 +17,6 @@ #include <time.h> #include <errno.h> #include <fcntl.h> -#ifndef QT_NO_IPV6IFNAME -#ifdef Q_OS_LINUX -#include <linux/if.h> -#else // Q_OS_LINUX -#include <net/if.h> -#endif // !Q_OS_LINUX -#endif -#ifdef QT_LINUXBASE -#include <arpa/inet.h> -#endif -#ifdef Q_OS_BSD4 -#include <net/if_dl.h> -#endif #ifdef Q_OS_INTEGRITY #include <sys/uio.h> #endif |