From 643d19f87b09ef486afa64eb630153e482f8a6e9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 9 Aug 2017 15:42:03 -0700
Subject: [PATCH] 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>
---
 src/network/configure.json                    | 3 ++-
 src/network/kernel/qnetworkinterface_unix.cpp | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/network/configure.json b/src/network/configure.json
index 6e7ce250515..916448a7276 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 4f4615d4d08..afa6b4296ee 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