summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/network/configure.json3
-rw-r--r--src/network/kernel/qnetworkinterface_unix.cpp5
2 files changed, 2 insertions, 6 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index 6e7ce25051..916448a727 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -135,7 +135,8 @@
"main": [
"char buf[IFNAMSIZ];",
"if_nametoindex(\"eth0\");",
- "if_indextoname(1, buf);"
+ "if_indextoname(1, buf);",
+ "if_freenameindex(if_nameindex());"
]
},
"use": "network"
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