1 files changed, 20 insertions, 13 deletions

diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 1b62892c9f..11b80d59d5 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -7,8 +7,6 @@ HEADERS += kernel/qtnetworkglobal.h \
            kernel/qtnetworkglobal_p.h \
            kernel/qauthenticator.h \
            kernel/qauthenticator_p.h \
-           kernel/qdnslookup.h \
-           kernel/qdnslookup_p.h \
            kernel/qhostaddress.h \
            kernel/qhostaddress_p.h \
            kernel/qhostinfo.h \
@@ -17,10 +15,10 @@ HEADERS += kernel/qtnetworkglobal.h \
            kernel/qnetworkdatagram_p.h \
            kernel/qnetworkinterface.h \
            kernel/qnetworkinterface_p.h \
+           kernel/qnetworkinterface_unix_p.h \
            kernel/qnetworkproxy.h
 
 SOURCES += kernel/qauthenticator.cpp \
-           kernel/qdnslookup.cpp \
            kernel/qhostaddress.cpp \
            kernel/qhostinfo.cpp \
            kernel/qnetworkdatagram.cpp \
@@ -32,12 +30,22 @@ qtConfig(ftp) {
     SOURCES += kernel/qurlinfo.cpp
 }
 
+qtConfig(dnslookup) {
+    HEADERS += kernel/qdnslookup.h \
+               kernel/qdnslookup_p.h
+
+    SOURCES += kernel/qdnslookup.cpp
+}
+
 unix {
-    !integrity: SOURCES += kernel/qdnslookup_unix.cpp
-    SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
+    !integrity:qtConfig(dnslookup): SOURCES += kernel/qdnslookup_unix.cpp
+    SOURCES += kernel/qhostinfo_unix.cpp
+
+    qtConfig(linux-netlink): SOURCES += kernel/qnetworkinterface_linux.cpp
+    else: SOURCES += kernel/qnetworkinterface_unix.cpp
 }
 
-android {
+android:qtConfig(dnslookup) {
     SOURCES -= kernel/qdnslookup_unix.cpp
     SOURCES += kernel/qdnslookup_android.cpp
 }
@@ -46,14 +54,12 @@ win32: {
     SOURCES += kernel/qhostinfo_win.cpp
 
     !winrt {
-        SOURCES += kernel/qdnslookup_win.cpp \
-                   kernel/qnetworkinterface_win.cpp
+        SOURCES += kernel/qnetworkinterface_win.cpp
+        qtConfig(dnslookup): SOURCES += kernel/qdnslookup_win.cpp
         LIBS_PRIVATE += -ldnsapi -liphlpapi
-        DEFINES += WINVER=0x0600 _WIN32_WINNT=0x0600
-
     } else {
-        SOURCES += kernel/qdnslookup_winrt.cpp \
-                   kernel/qnetworkinterface_winrt.cpp
+        SOURCES += kernel/qnetworkinterface_winrt.cpp
+        qtConfig(dnslookup): SOURCES += kernel/qdnslookup_winrt.cpp
     }
 }
 
@@ -62,8 +68,9 @@ mac {
     !uikit: LIBS_PRIVATE += -framework CoreServices -framework SystemConfiguration
 }
 
+uikit:HEADERS += kernel/qnetworkinterface_uikit_p.h
 osx:SOURCES += kernel/qnetworkproxy_mac.cpp
-else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
+else:win32:!winrt: SOURCES += kernel/qnetworkproxy_win.cpp
 else: qtConfig(libproxy) {
     SOURCES += kernel/qnetworkproxy_libproxy.cpp
     QMAKE_USE_PRIVATE += libproxy libdl