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>

6 files changed, 15 insertions, 32 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt
index 8e68089f5e..3bb7e31691 100644
--- a/tests/auto/widgets/kernel/qapplication/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Generated from qapplication.pro.
 
+add_subdirectory(desktopsettingsaware)
+add_subdirectory(modal)
 add_subdirectory(test)
-if(NOT WINRT)
-    add_subdirectory(desktopsettingsaware)
-    add_subdirectory(modal)
-endif()
diff --git a/tests/auto/widgets/kernel/qapplication/qapplication.pro b/tests/auto/widgets/kernel/qapplication/qapplication.pro
index 21bfb50aee..5154c915cd 100644
--- a/tests/auto/widgets/kernel/qapplication/qapplication.pro
+++ b/tests/auto/widgets/kernel/qapplication/qapplication.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-!winrt: SUBDIRS = desktopsettingsaware modal
+SUBDIRS = desktopsettingsaware modal
 
 test.depends += $$SUBDIRS
 SUBDIRS += test
diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
index 40e612f0de..7f92e1cee8 100644
--- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
@@ -29,14 +29,14 @@ extend_target(test CONDITION builtin_testdata
         BUILTIN_TESTDATA
 )
 
-#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID:
 # SUBPROGRAMS = "desktopsettingsaware" "modal"
 
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../debug/helper"
 
-#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../release/helper"
 
-#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../helper"
diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
index 171ee1b273..304480f509 100644
--- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
@@ -30,14 +30,14 @@ extend_target(tst_qapplication CONDITION builtin_testdata # special case
         BUILTIN_TESTDATA
 )
 
-#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID:
 # SUBPROGRAMS = "desktopsettingsaware" "modal"
 
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../debug/helper"
 
-#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../release/helper"
 
-#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID:
 # TEST_HELPER_INSTALLS = "../helper"
diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 8ade4d8364..39b099261a 100644
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -9,20 +9,20 @@ builtin_testdata: DEFINES += BUILTIN_TESTDATA
 
 TESTDATA = ../test/test.pro ../tmp/README ../modal
 
-!android:!winrt: SUBPROGRAMS = desktopsettingsaware modal
+!android: SUBPROGRAMS = desktopsettingsaware modal
 
 debug_and_release {
     CONFIG(debug, debug|release) {
         TARGET = ../../debug/tst_qapplication
-        !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
+        !android: TEST_HELPER_INSTALLS = ../debug/helper
         for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../debug/$${file}"
     } else {
         TARGET = ../../release/tst_qapplication
-        !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
+        !android: TEST_HELPER_INSTALLS = ../release/helper
         for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../release/$${file}"
     }
 } else {
     TARGET = ../tst_qapplication
-    !android:!winrt: TEST_HELPER_INSTALLS = ../helper
+    !android: TEST_HELPER_INSTALLS = ../helper
     for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}"
 }
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index c9857b4379..b0689f5c16 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -241,9 +241,6 @@ public:
 
 void tst_QApplication::alert()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("WinRT does not support more than 1 native widget at the same time");
-#endif
     int argc = 0;
     QApplication app(argc, nullptr);
     QApplication::alert(nullptr, 0);
@@ -811,9 +808,6 @@ public:
 
 void tst_QApplication::closeAllWindows()
 {
-#ifdef Q_OS_WINRT
-    QSKIP("PromptOnCloseWidget does not work on WinRT - QTBUG-68297");
-#endif
     int argc = 0;
     QApplication app(argc, nullptr);
 
@@ -922,9 +916,6 @@ void tst_QApplication::libraryPaths()
         expected = QSet<QString>(expected.constBegin(), expected.constEnd()).values();
         expected.sort();
 
-#ifdef Q_OS_WINRT
-        QEXPECT_FAIL("", "On WinRT PluginsPath is outside of sandbox. QTBUG-68297", Abort);
-#endif
         QVERIFY2(isPathListIncluded(actual, expected),
                  qPrintable("actual:\n - " + actual.join("\n - ") +
                             "\nexpected:\n - " + expected.join("\n - ")));
@@ -1032,9 +1023,6 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
             << QDir(QCoreApplication::applicationDirPath()).canonicalPath()
             << QDir(QDir::fromNativeSeparators(QString::fromLatin1(validPath))).canonicalPath();
 
-#ifdef Q_OS_WINRT
-        QEXPECT_FAIL("", "On WinRT PluginsPath is outside of sandbox. QTBUG-68297", Abort);
-#endif
         QVERIFY2(isPathListIncluded(QCoreApplication::libraryPaths(), expected),
                  qPrintable("actual:\n - " + QCoreApplication::libraryPaths().join("\n - ") +
                             "\nexpected:\n - " + expected.join("\n - ")));
@@ -1753,9 +1741,6 @@ void tst_QApplication::focusMouseClick()
     QSpontaneKeyEvent::setSpontaneous(&ev);
     QVERIFY(ev.spontaneous());
     qApp->notify(&w2, &ev);
-#ifdef Q_OS_WINRT
-    QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort);
-#endif
     QTRY_COMPARE(QApplication::focusWidget(), &w2);
 
     // now back to tab focus and click again (it already had focus) -> focus should stay