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, 64 insertions, 66 deletions

diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt
index 9dc85e556a..bce68a37d8 100644
--- a/tests/auto/testlib/selftests/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/CMakeLists.txt
@@ -52,7 +52,7 @@ qt_add_resource(tst_selftests "qmake_expected_files"
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS):
+#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS):
 # TEST_HELPER_INSTALLS = "../$${file}/$${file}"
 
 #### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui:
@@ -63,71 +63,69 @@ qt_apply_testlib_coverage_options(tst_selftests)
 # ------------- Sub tests -------------
 
 # special case begin
-if(NOT WINRT)
-    set(subprograms
-        assert
-        badxml
-        benchlibcallgrind
-        benchlibcounting
-        benchlibeventcounter
-        benchliboptions
-        benchlibtickcounter
-        benchlibwalltime
-        blacklisted
-        cmptest
-        commandlinedata
-        counting
-        crashes
-        datatable
-        datetime
-        deleteLater
-        deleteLater_noApp
-        differentexec
-        exceptionthrow
-        expectfail
-        failcleanup
-        faildatatype
-        failfetchtype
-        failinit
-        failinitdata
-        fetchbogus
-        findtestdata
-        float
-        globaldata
-        longstring
-        maxwarnings
-        multiexec
-        pass
-        pairdiagnostics
-        printdatatags
-        printdatatagswithglobaltags
-        qexecstringlist
-        silent
-        signaldumper
-        singleskip
-        skip
-        skipcleanup
-        skipinit
-        skipinitdata
-        sleep
-        strcmp
-        subtest
-        testlib
-        tuplediagnostics
-        verbose1
-        verbose2
-        verifyexceptionthrown
-        warnings
-        watchdog
-        xunit
-    )
+set(subprograms
+    assert
+    badxml
+    benchlibcallgrind
+    benchlibcounting
+    benchlibeventcounter
+    benchliboptions
+    benchlibtickcounter
+    benchlibwalltime
+    blacklisted
+    cmptest
+    commandlinedata
+    counting
+    crashes
+    datatable
+    datetime
+    deleteLater
+    deleteLater_noApp
+    differentexec
+    exceptionthrow
+    expectfail
+    failcleanup
+    faildatatype
+    failfetchtype
+    failinit
+    failinitdata
+    fetchbogus
+    findtestdata
+    float
+    globaldata
+    longstring
+    maxwarnings
+    multiexec
+    pass
+    pairdiagnostics
+    printdatatags
+    printdatatagswithglobaltags
+    qexecstringlist
+    silent
+    signaldumper
+    singleskip
+    skip
+    skipcleanup
+    skipinit
+    skipinitdata
+    sleep
+    strcmp
+    subtest
+    testlib
+    tuplediagnostics
+    verbose1
+    verbose2
+    verifyexceptionthrown
+    warnings
+    watchdog
+    xunit
+)
 
-    if(TARGET Qt::Gui)
-        list(APPEND subprograms
-            keyboard
-            mouse
-        )
-    endif()
+if(TARGET Qt::Gui)
+    list(APPEND subprograms
+        keyboard
+        mouse
+    )
 endif()
 
 foreach(subprogram IN LISTS subprograms)
@@ -149,6 +147,6 @@ qt_extend_target(tst_selftests
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS):
+#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS):
 # TEST_HELPER_INSTALLS = "../$${file}/$${file}"
 # special case end