summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-08-09 15:42:03 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-08-24 03:47:12 +0000
commit643d19f87b09ef486afa64eb630153e482f8a6e9 (patch)
tree702c90fb9b2537ebe812e262294af5b4401f43d2 /src/network/kernel
parent94c4827a9f3942ddde2f2371de4e1aab709995cb (diff)
QNetworkInterface: Fold the test for if_nameindex into the config test
No need to make workarounds for Android in the .cpp source. Just let it fail (if it still has to fail). Change-Id: Iaf4157b7efa2416d898cfffd14d94ebcb4d979be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qnetworkinterface_unix.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 4f4615d4d0..afa6b4296e 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -60,11 +60,6 @@
# define QT_NO_GETIFADDRS
#endif
-#ifdef Q_OS_ANDROID
-// android lacks if_nameindex
-# define QT_NO_IPV6IFNAME
-#endif
-
#ifdef Q_OS_HAIKU
# include <sys/sockio.h>
# define IFF_RUNNING 0x0001