Remove winrt

Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.

Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

5 files changed, 0 insertions, 20 deletions

diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt
index 6ce3fcdf32..0b25020694 100644
--- a/tests/auto/network/kernel/CMakeLists.txt
+++ b/tests/auto/network/kernel/CMakeLists.txt
@@ -5,11 +5,6 @@ add_subdirectory(qnetworkdatagram)
 add_subdirectory(qnetworkaddressentry)
 add_subdirectory(qhostaddress)
 
-if(NOT WINRT)
-    add_subdirectory(qnetworkproxy)
-    add_subdirectory(qnetworkproxyfactory)
-endif()
-
 if(QT_FEATURE_private_tests)
     add_subdirectory(qauthenticator)
 
diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro
index 42df80dfa1..c13378cc02 100644
--- a/tests/auto/network/kernel/kernel.pro
+++ b/tests/auto/network/kernel/kernel.pro
@@ -11,10 +11,6 @@ SUBDIRS=\
    qnetworkaddressentry \
    qhostaddress \
 
-winrt: SUBDIRS -= \
-   qnetworkproxy \
-   qnetworkproxyfactory \
-
 osx: SUBDIRS -= \ # QTBUG-41847
     qhostinfo \
 
diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index 48f05a4604..ad8c4a8d1c 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -38,9 +38,6 @@
 #include <qdatastream.h>
 #ifdef Q_OS_WIN
 #  include <qt_windows.h>
-#  if defined(Q_OS_WINRT)
-#    include <winsock2.h>
-#  endif
 #endif
 
 #ifdef Q_OS_ANDROID
@@ -384,15 +381,12 @@ void tst_QHostAddress::assignment()
     QCOMPARE(address, QHostAddress("::1"));
 #endif
 
-    // WinRT does not support sockaddr_in
-#ifndef Q_OS_WINRT
     QHostAddress addr("4.2.2.1");
     sockaddr_in sockAddr;
     sockAddr.sin_family = AF_INET;
     sockAddr.sin_addr.s_addr = htonl(addr.toIPv4Address());
     address.setAddress((sockaddr *)&sockAddr);
     QCOMPARE(address, addr);
-#endif // !Q_OS_WINRT
 }
 
 QT_WARNING_POP
diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
index 19eae0611d..891312ae5e 100644
--- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
+++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
@@ -26,6 +26,3 @@ extend_target(tst_qhostinfo CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
-
-#### Keys ignored in scope 3:.:.:qhostinfo.pro:WINRT:
-# WINRT_MANIFEST.capabilities = "internetClientServer"
diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
index d358cdf52c..e084f28229 100644
--- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
@@ -7,5 +7,3 @@ requires(qtConfig(private_tests))
 QT = core-private network-private testlib
 
 win32: QMAKE_USE += ws2_32
-
-winrt: WINRT_MANIFEST.capabilities += internetClientServer