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>

8 files changed, 14 insertions, 25 deletions

diff --git a/tests/auto/other/.prev_CMakeLists.txt b/tests/auto/other/.prev_CMakeLists.txt
index 74ea69ee0e..d89e950690 100644
--- a/tests/auto/other/.prev_CMakeLists.txt
+++ b/tests/auto/other/.prev_CMakeLists.txt
@@ -11,7 +11,7 @@ if(TARGET Qt::Widgets)
     add_subdirectory(qsharedpointer_and_qwidget)
     add_subdirectory(windowsmobile)
 endif()
-if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
+if(TARGET Qt::Network AND TARGET Qt::Widgets)
     add_subdirectory(lancelot)
     add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
 endif()
@@ -26,13 +26,13 @@ endif()
 if(QT_FEATURE_process AND TARGET Qt::Gui)
     add_subdirectory(qprocess_and_guieventloop)
 endif()
-if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT WINRT)
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     add_subdirectory(qaccessibility)
 endif()
 if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     add_subdirectory(qaccessibilitylinux)
 endif()
-if(TARGET Qt::Network AND NOT WINRT)
+if(TARGET Qt::Network)
     add_subdirectory(networkselftest)
 endif()
 if(MACOS AND TARGET Qt::Gui)
diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt
index 808afeff35..6a9569332d 100644
--- a/tests/auto/other/CMakeLists.txt
+++ b/tests/auto/other/CMakeLists.txt
@@ -11,7 +11,7 @@ if(TARGET Qt::Widgets)
     add_subdirectory(qsharedpointer_and_qwidget)
     # add_subdirectory(windowsmobile) <- does not exist # special case
 endif()
-if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
+if(TARGET Qt::Network AND TARGET Qt::Widgets)
     add_subdirectory(lancelot)
     add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
 endif()
@@ -26,13 +26,13 @@ endif()
 if(QT_FEATURE_process AND TARGET Qt::Gui)
     add_subdirectory(qprocess_and_guieventloop)
 endif()
-if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT WINRT)
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     add_subdirectory(qaccessibility)
 endif()
 if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     #add_subdirectory(qaccessibilitylinux) # special case # This test is broken
 endif()
-if(TARGET Qt::Network AND NOT WINRT)
+if(TARGET Qt::Network)
     add_subdirectory(networkselftest)
 endif()
 if(MACOS AND TARGET Qt::Gui)
diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp
index 14ede33500..fc3d0f1c06 100644
--- a/tests/auto/other/languagechange/tst_languagechange.cpp
+++ b/tests/auto/other/languagechange/tst_languagechange.cpp
@@ -197,7 +197,7 @@ void tst_languageChange::retranslatability_data()
                     << "QFileDialog::Back"
                     << "QFileDialog::Create New Folder"
                     << "QFileDialog::Detail View"
-#if !defined(Q_OS_MAC) && !defined(Q_OS_WINRT)
+#if !defined(Q_OS_MAC)
                     << "QFileDialog::File"
 #endif
                     << "QFileDialog::Files of type:"
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 8a99d0eef6..8d72957ac7 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -40,7 +40,7 @@ SUBDIRS=\
    qaccessibilitylinux \
    qaccessibilitymac \
 
-winrt|!qtHaveModule(network): SUBDIRS -= \
+!qtHaveModule(network): SUBDIRS -= \
    lancelot \
    networkselftest \
    qnetworkaccessmanager_and_qprogressdialog \
@@ -49,7 +49,7 @@ cross_compile: SUBDIRS -= \
    atwrapper \
    compiler
 
-winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility
+!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility
 
 !qtHaveModule(gui)|!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
 
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 8663e412c4..7dea6c37e6 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -33,13 +33,9 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
 
 extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
         ole32
         oleacc
         oleaut32
         uuid
 )
-
-extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
-    PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
-)
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index f5f74bbafc..8a27fc25cc 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -39,13 +39,9 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
 
 extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
         ole32
         oleacc
         oleaut32
         uuid
 )
-
-extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
-    PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
-)
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 339e7ad20d..07cccde0c8 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -30,10 +30,8 @@
 #include <QtCore/qglobal.h>
 #ifdef Q_OS_WIN
 # include <QtCore/qt_windows.h>
-#ifndef Q_OS_WINRT
 # include <oleacc.h>
 # include <QtGui/private/qwindowsuiawrapper_p.h>
-#endif
 # include <servprov.h>
 # include <winuser.h>
 #endif
@@ -3774,7 +3772,7 @@ void tst_QAccessibility::bridgeTest()
 {
     // For now this is a simple test to see if the bridge is working at all.
     // Ideally it should be extended to test all aspects of the bridge.
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if defined(Q_OS_WIN)
 
     QWidget window;
     QVBoxLayout *lay = new QVBoxLayout(&window);
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 9285d5b5da..0242f8a36e 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -357,10 +357,9 @@ void tst_QFocusEvent::checkReason_ActiveWindow()
     d->hide();
 
     if (!QGuiApplication::platformName().compare(QLatin1String("offscreen"), Qt::CaseInsensitive)
-        || !QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive)
-        || !QGuiApplication::platformName().compare(QLatin1String("winrt"), Qt::CaseInsensitive)) {
+        || !QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive)) {
         // Activate window of testFocusWidget, focus in that window goes to childFocusWidgetOne
-        QWARN("Platforms offscreen, minimal, and winrt require explicit activateWindow()");
+        QWARN("Platforms offscreen and minimal require explicit activateWindow()");
         testFocusWidget->activateWindow();
     }