From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Fri, 5 Jun 2020 09:24:37 +0200
Subject: Remove winrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../platformsocketengine/tst_platformsocketengine.cpp      | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp')

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"
-- 
cgit v1.2.3