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>
---
 tests/auto/corelib/kernel/qobject/CMakeLists.txt  | 14 ++------------
 tests/auto/corelib/kernel/qobject/qobject.pro     |  4 ++--
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp |  3 ---
 3 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'tests/auto/corelib/kernel/qobject')

diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
index 3be3287532..ba8c67bd99 100644
--- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
@@ -9,21 +9,11 @@ add_qt_test(tst_qobject
         tst_qobject.cpp
     DEFINES
         QT_DISABLE_DEPRECATED_BEFORE=0
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Network
 )
 
-#### Keys ignored in scope 3:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase" "console"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 4:.:.:test.pro:QT_CONFIG___contains___c++1z:
-# CONFIG = "c++1z"
-
-if(NOT WINRT)
-    add_subdirectory(signalbug)
-endif()
+add_subdirectory(signalbug)
diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 75ad7b5f14..bdbec1e9f8 100644
--- a/tests/auto/corelib/kernel/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
-SUBDIRS += test.pro
-!winrt: SUBDIRS += signalbug
+SUBDIRS += test.pro \
+           signalbug
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 917c4e639f..b2dc3c7297 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -1862,8 +1862,6 @@ void tst_QObject::moveToThread()
         thread.wait();
     }
 
-    // WinRT does not allow connection to localhost
-#ifndef Q_OS_WINRT
     {
         // make sure socket notifiers are moved with the object
         MoveToThreadThread thread;
@@ -1899,7 +1897,6 @@ void tst_QObject::moveToThread()
         QMetaObject::invokeMethod(socket, "deleteLater", Qt::QueuedConnection);
         thread.wait();
     }
-#endif
 }
 
 
-- 
cgit v1.2.3