summaryrefslogtreecommitdiffstats
path: root/src/network/kernel/kernel.pri
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@theqtcompany.com>2015-12-16 15:33:42 +0100
committerOliver Wolff <oliver.wolff@theqtcompany.com>2016-01-05 08:14:31 +0000
commit190c76f685f1dcafbcc762082edcdccdb9bb8b0b (patch)
tree6d7d0bdb92da83f8875db96948ae2c80fcb0cd07 /src/network/kernel/kernel.pri
parent2ca20724dd17df96143be160505f982ab6cf4378 (diff)
winrt: Use winsock2 API for hostname resolution on WinRT/WinPhone
That API has been available for WinRT and Windows Phone for some time now. By using it to get the machine name and for hostname resolution we can get rid of some winrt-only code and use qhostinfo_win.cpp on WinRT and Windows phone as well. Additionally the required capability was added to tst_qhostinfo so that this auto test can be run without any manual editing. Change-Id: I63fa5521bf8cdb0c919bd5a0100ea977c865622a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'src/network/kernel/kernel.pri')
-rw-r--r--src/network/kernel/kernel.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 435bfd6c27..ddb30b7b6f 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -33,16 +33,16 @@ android {
}
win32: {
+ SOURCES += kernel/qhostinfo_win.cpp
+
!winrt {
SOURCES += kernel/qdnslookup_win.cpp \
- kernel/qhostinfo_win.cpp \
kernel/qnetworkinterface_win.cpp
LIBS_PRIVATE += -ldnsapi -liphlpapi
DEFINES += WINVER=0x0600 _WIN32_WINNT=0x0600
} else {
SOURCES += kernel/qdnslookup_winrt.cpp \
- kernel/qhostinfo_winrt.cpp \
kernel/qnetworkinterface_winrt.cpp
}
}