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>
---
 .../kernel/qsocketnotifier/tst_qsocketnotifier.cpp      | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp')

diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
index 8ba3505d8b..9ab540cdf2 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -36,11 +36,7 @@
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
 #include <QtNetwork/QUdpSocket>
-#ifndef Q_OS_WINRT
 #include <private/qnativesocketengine_p.h>
-#else
-#include <private/qnativesocketengine_winrt_p.h>
-#endif
 #define NATIVESOCKETENGINE QNativeSocketEngine
 #ifdef Q_OS_UNIX
 #include <private/qnet_unix_p.h>
@@ -130,10 +126,6 @@ signals:
 
 void tst_QSocketNotifier::unexpectedDisconnection()
 {
-#ifdef Q_OS_WINRT
-    // WinRT does not allow a connection to the localhost
-    QSKIP("Local connection not allowed", SkipAll);
-#else
     /*
       Given two sockets and two QSocketNotifiers registered on each
       their socket. If both sockets receive data, and the first slot
@@ -199,7 +191,6 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     writeEnd1->close();
     writeEnd2->close();
     server.close();
-#endif // !Q_OS_WINRT
 }
 
 class MixingWithTimersHelper : public QObject
@@ -238,9 +229,6 @@ void MixingWithTimersHelper::socketFired()
 
 void tst_QSocketNotifier::mixingWithTimers()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not allow connection to localhost", SkipAll);
-#else
     QTimer timer;
     timer.setInterval(0);
     timer.start();
@@ -265,7 +253,6 @@ void tst_QSocketNotifier::mixingWithTimers()
 
     QCOMPARE(helper.timerActivated, true);
     QTRY_COMPARE(helper.socketActivated, true);
-#endif // !Q_OS_WINRT
 }
 
 #ifdef Q_OS_UNIX
@@ -354,9 +341,6 @@ void tst_QSocketNotifier::async_writeDatagramSlot()
 
 void tst_QSocketNotifier::asyncMultipleDatagram()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not allow connection to localhost", SkipAll);
-#else
     m_asyncSender = new QUdpSocket;
     m_asyncReceiver = new QUdpSocket;
 
@@ -386,7 +370,6 @@ void tst_QSocketNotifier::asyncMultipleDatagram()
 
     delete m_asyncSender;
     delete m_asyncReceiver;
-    #endif // !Q_OS_WINRT
 }
 
 void tst_QSocketNotifier::activationReason_data()
-- 
cgit v1.2.3