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>

1 files changed, 0 insertions, 54 deletions

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 0ac87a9cb1..538864db6c 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1307,9 +1307,6 @@ protected slots:
 
 void tst_QSslSocket::protocolServerSide_data()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QTest::addColumn<QSsl::SslProtocol>("serverProtocol");
     QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
     QTest::addColumn<bool>("works");
@@ -1413,9 +1410,6 @@ void tst_QSslSocket::protocolServerSide()
 
 void tst_QSslSocket::serverCipherPreferences()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl()) {
         qWarning("SSL not supported, skipping test");
         return;
@@ -1542,9 +1536,6 @@ void tst_QSslSocket::localCertificateChain()
 
 void tst_QSslSocket::setLocalCertificateChain()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl())
         return;
 
@@ -1587,9 +1578,6 @@ void tst_QSslSocket::setPrivateKey()
 
 void tst_QSslSocket::setSocketDescriptor()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl())
         return;
 
@@ -1995,9 +1983,6 @@ protected:
 
 void tst_QSslSocket::setEmptyKey()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl())
         return;
 
@@ -2019,9 +2004,6 @@ void tst_QSslSocket::setEmptyKey()
 
 void tst_QSslSocket::spontaneousWrite()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -2067,9 +2049,6 @@ void tst_QSslSocket::spontaneousWrite()
 
 void tst_QSslSocket::setReadBufferSize()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -2331,9 +2310,6 @@ void tst_QSslSocket::waitForMinusOne()
 #ifdef Q_OS_WIN
     QSKIP("QTBUG-24451 - indefinite wait may hang");
 #endif
-#ifdef Q_OS_WINRT // This can stay in case the one above goes away
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -2412,9 +2388,6 @@ protected:
 
 void tst_QSslSocket::verifyMode()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -2698,9 +2671,6 @@ void tst_QSslSocket::ignoreSslErrorsListWithSlot()
 
 void tst_QSslSocket::abortOnSslErrors()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -2800,9 +2770,6 @@ void tst_QSslSocket::writeBigChunk()
 
 void tst_QSslSocket::blacklistedCertificates()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -3064,9 +3031,6 @@ protected:
 
 void tst_QSslSocket::qtbug18498_peek()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -3140,9 +3104,6 @@ protected:
 
 void tst_QSslSocket::qtbug18498_peek2()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
@@ -3246,9 +3207,6 @@ void tst_QSslSocket::qtbug18498_peek2()
 
 void tst_QSslSocket::dhServer()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl())
         QSKIP("No SSL support");
 
@@ -3358,9 +3316,6 @@ void tst_QSslSocket::dhServerCustomParams()
 
 void tst_QSslSocket::ecdhServer()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl()) {
         qWarning("SSL not supported, skipping test");
         return;
@@ -3467,9 +3422,6 @@ void tst_QSslSocket::verifyClientCertificate()
     // success instead of failure etc.).
     QSKIP("This test can not work with Secure Transport");
 #endif // QT_CONFIG(securetransport)
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     if (!QSslSocket::supportsSsl()) {
         qWarning("SSL not supported, skipping test");
         return;
@@ -4049,9 +4001,6 @@ void tst_QSslSocket::simplePskConnect()
 
 void tst_QSslSocket::ephemeralServerKey_data()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
     QTest::addColumn<QString>("cipher");
     QTest::addColumn<bool>("emptyKey");
 
@@ -4084,9 +4033,6 @@ void tst_QSslSocket::ephemeralServerKey()
 
 void tst_QSslSocket::pskServer()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("Server-side encryption is not implemented on WinRT.");
-#endif
 #if QT_CONFIG(schannel)
     QSKIP("Schannel does not have PSK support implemented.");
 #endif