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>

8 files changed, 26 insertions, 58 deletions

diff --git a/tests/auto/network/socket/.prev_CMakeLists.txt b/tests/auto/network/socket/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7e72b4be29
--- /dev/null
+++ b/tests/auto/network/socket/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from socket.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qhttpsocketengine)
+    add_subdirectory(qtcpsocket)
+    add_subdirectory(qsocks5socketengine)
+    add_subdirectory(platformsocketengine)
+endif()
+add_subdirectory(qudpsocket)
+add_subdirectory(qlocalsocket)
+add_subdirectory(qtcpserver)
+add_subdirectory(qabstractsocket)
+if(QT_FEATURE_sctp)
+    add_subdirectory(qsctpsocket)
+endif()
diff --git a/tests/auto/network/socket/CMakeLists.txt b/tests/auto/network/socket/CMakeLists.txt
index 5019e47140..a4b19ac1d6 100644
--- a/tests/auto/network/socket/CMakeLists.txt
+++ b/tests/auto/network/socket/CMakeLists.txt
@@ -1,20 +1,15 @@
 # Generated from socket.pro.
 
-add_subdirectory(qudpsocket)
-### add_subdirectory(qlocalsocket)
-add_subdirectory(qtcpserver)
-add_subdirectory(qabstractsocket)
-
 if(QT_FEATURE_private_tests)
-    add_subdirectory(platformsocketengine)
+    add_subdirectory(qhttpsocketengine)
     add_subdirectory(qtcpsocket)
-
-    if(NOT WINRT)
-        add_subdirectory(qhttpsocketengine)
-        add_subdirectory(qsocks5socketengine)
-    endif()
+    add_subdirectory(qsocks5socketengine)
+    add_subdirectory(platformsocketengine)
 endif()
-
+add_subdirectory(qudpsocket)
+### add_subdirectory(qlocalsocket) # special case
+add_subdirectory(qtcpserver)
+add_subdirectory(qabstractsocket)
 if(QT_FEATURE_sctp)
     add_subdirectory(qsctpsocket)
 endif()
diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
index 68c913ecfc..88a39eea93 100644
--- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
@@ -48,11 +48,7 @@
 
 #define PLATFORMSOCKETENGINE QNativeSocketEngine
 #define PLATFORMSOCKETENGINESTRING "QNativeSocketEngine"
-#ifndef Q_OS_WINRT
-#  include <private/qnativesocketengine_p.h>
-#else
-#  include <private/qnativesocketengine_winrt_p.h>
-#endif
+#include <private/qnativesocketengine_p.h>
 
 #include <qstringlist.h>
 
@@ -79,9 +75,7 @@ private slots:
     void networkError();
     void setSocketDescriptor();
     void invalidSend();
-#ifndef Q_OS_WINRT
     void receiveUrgentData();
-#endif
     void tooManySockets();
 };
 
@@ -582,9 +576,7 @@ void tst_PlatformSocketEngine::networkError()
     QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
 
     // An unexpected network error!
-#ifdef Q_OS_WINRT
-    client.close();
-#elif defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     // could use shutdown to produce different errors
     ::closesocket(client.socketDescriptor());
 #else
@@ -617,7 +609,6 @@ void tst_PlatformSocketEngine::invalidSend()
 }
 
 //---------------------------------------------------------------------------
-#ifndef Q_OS_WINRT
 void tst_PlatformSocketEngine::receiveUrgentData()
 {
     PLATFORMSOCKETENGINE server;
@@ -680,7 +671,6 @@ void tst_PlatformSocketEngine::receiveUrgentData()
     QCOMPARE(response.at(0), msg);
 #endif
 }
-#endif // !Q_OS_WINRT
 
 QTEST_MAIN(tst_PlatformSocketEngine)
 #include "tst_platformsocketengine.moc"
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
index 5c66ef6520..7cb65cd1a3 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
@@ -29,14 +29,14 @@
 
 #include <QtCore>
 #include <QtNetwork>
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
+#if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
 #  include <crtdbg.h>
 #endif
 
 int main(int argc, char *argv[])
 {
      // Windows: Suppress crash notification dialog.
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
+#if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
     _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
 #endif
     QCoreApplication app(argc, argv);
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 094e28149c..927dc5cf9a 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -88,9 +88,7 @@ private slots:
     void maxPendingConnections();
     void listenError();
     void waitForConnectionTest();
-#ifndef Q_OS_WINRT
     void setSocketDescriptor();
-#endif
     void listenWhileListening();
     void addressReusable();
     void setNewSocketDescriptorBlocking();
@@ -527,7 +525,6 @@ void tst_QTcpServer::waitForConnectionTest()
 }
 
 //----------------------------------------------------------------------------------
-#ifndef Q_OS_WINRT
 void tst_QTcpServer::setSocketDescriptor()
 {
     QTcpServer server;
@@ -557,7 +554,6 @@ void tst_QTcpServer::setSocketDescriptor()
     WSACleanup();
 #endif
 }
-#endif // !Q_OS_WINRT
 
 //----------------------------------------------------------------------------------
 void tst_QTcpServer::listenWhileListening()
@@ -579,7 +575,6 @@ public:
     bool ok;
 
 protected:
-#ifndef Q_OS_WINRT
     void incomingConnection(qintptr socketDescriptor)
     {
         // how a user woulddo it (qabstractsocketengine is not public)
@@ -592,7 +587,6 @@ protected:
         ::close(socketDescriptor);
 #endif
     }
-#endif // !Q_OS_WINRT
 };
 
 void tst_QTcpServer::addressReusable()
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 88d2c46f3d..3c4728afec 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -126,9 +126,7 @@ private slots:
     void bindThenResolveHost_data();
     void bindThenResolveHost();
     void setInvalidSocketDescriptor();
-#ifndef Q_OS_WINRT
     void setSocketDescriptor();
-#endif
     void socketDescriptor();
     void blockingIMAP();
     void nonBlockingIMAP();
@@ -738,7 +736,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor()
 
 //----------------------------------------------------------------------------------
 
-#ifndef Q_OS_WINRT
 void tst_QTcpSocket::setSocketDescriptor()
 {
     QFETCH_GLOBAL(bool, setProxy);
@@ -782,7 +779,6 @@ void tst_QTcpSocket::setSocketDescriptor()
     delete dummy;
 #endif
 }
-#endif // !Q_OS_WINRT
 
 //----------------------------------------------------------------------------------
 
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index b69bfb106c..425d61127a 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -1276,9 +1276,6 @@ void tst_QUdpSocket::multicastTtlOption_data()
 
 void tst_QUdpSocket::multicastTtlOption()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH(QHostAddress, bindAddress);
     QFETCH(int, ttl);
@@ -1326,9 +1323,6 @@ void tst_QUdpSocket::multicastLoopbackOption_data()
 
 void tst_QUdpSocket::multicastLoopbackOption()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH(QHostAddress, bindAddress);
     QFETCH(int, loopback);
@@ -1365,9 +1359,6 @@ void tst_QUdpSocket::multicastJoinBeforeBind_data()
 
 void tst_QUdpSocket::multicastJoinBeforeBind()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH(QHostAddress, groupAddress);
 
     QUdpSocket udpSocket;
@@ -1387,9 +1378,6 @@ void tst_QUdpSocket::multicastLeaveAfterClose_data()
 
 void tst_QUdpSocket::multicastLeaveAfterClose()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH(QHostAddress, groupAddress);
     if (setProxy)
@@ -1434,9 +1422,6 @@ void tst_QUdpSocket::setMulticastInterface_data()
 
 void tst_QUdpSocket::setMulticastInterface()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH(QNetworkInterface, iface);
     QFETCH(QHostAddress, address);
@@ -1494,9 +1479,6 @@ void tst_QUdpSocket::multicast_data()
 
 void tst_QUdpSocket::multicast()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support multicast.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH(QHostAddress, bindAddress);
     QFETCH(bool, bindResult);
diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro
index 06fe356a5a..1248d71172 100644
--- a/tests/auto/network/socket/socket.pro
+++ b/tests/auto/network/socket/socket.pro
@@ -20,7 +20,3 @@ SUBDIRS=\
 
 !qtConfig(sctp): SUBDIRS -= \
    qsctpsocket \
-
-winrt: SUBDIRS -= \
-   qhttpsocketengine \
-   qsocks5socketengine \