Remove winrt

Task-number: QTBUG-84434
Change-Id: I0a7628ac33971154244d3ddfe824889795aea06c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 120 insertions, 8 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 0000000..06e2911
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtactiveqt.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+include(.cmake.conf)
+project(activeqt_FIXME
+    VERSION "${QT_REPO_MODULE_VERSION}"
+    DESCRIPTION "Qt activeqt_FIXME Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+if(NOT TARGET Qt::Widgets)
+    message(NOTICE "Skipping the build as the condition \"TARGET Qt::Widgets\" is not met.")
+    return()
+endif()
+qt_build_repo()
diff --git a/qtactiveqt.pro b/qtactiveqt.pro
index 1e17fa8..ba8e079 100644
--- a/qtactiveqt.pro
+++ b/qtactiveqt.pro
@@ -3,7 +3,7 @@ requires(qtHaveModule(widgets))
 CONFIG += tests_need_tools
 load(qt_parts)
 
-!win32|winrt {
+!win32 {
     message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.")
     SUBDIRS = src
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7e72c9..b8658da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from src.pro.
 
 add_subdirectory(activeqt)
-if(WIN32 AND NOT WINRT)
+if(WIN32)
     add_subdirectory(tools)
 endif()
diff --git a/src/activeqt/.prev_CMakeLists.txt b/src/activeqt/.prev_CMakeLists.txt
new file mode 100644
index 0000000..bdfe1b3
--- /dev/null
+++ b/src/activeqt/.prev_CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from activeqt.pro.
+
+#####################################################################
+## activeqt Binary:
+#####################################################################
+
+qt_add_executable(activeqt
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:activeqt.pro:WIN32:
+# SUBDIRS = "axbase" "control" "container" "activeqt"
+# TEMPLATE = "subdirs"
+# activeqt.file = "activeqt.prx"
+
+#### Keys ignored in scope 3:.:.:activeqt.pro:else:
+# TEMPLATE = "aux"
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt
index 90939be..5034157 100644
--- a/src/activeqt/CMakeLists.txt
+++ b/src/activeqt/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_add_docs(ActiveQt
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:activeqt.pro:WIN32 AND NOT WINRT:
+#### Keys ignored in scope 2:.:.:activeqt.pro:WIN32:
 # SUBDIRS = "axbase" "control" "container" "activeqt"
 # TEMPLATE = "subdirs"
 # activeqt.file = "activeqt.prx"
diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro
index 0df9463..327c232 100644
--- a/src/activeqt/activeqt.pro
+++ b/src/activeqt/activeqt.pro
@@ -1,4 +1,4 @@
-win32:!winrt {
+win32 {
     TEMPLATE = subdirs
 
     CONFIG += ordered
diff --git a/src/src.pro b/src/src.pro
index 6cff49f..f8c9d2c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = activeqt
-win32:!winrt: SUBDIRS += tools
+win32: SUBDIRS += tools
 CONFIG += ordered
diff --git a/tests/manual/axviewer/.prev_CMakeLists.txt b/tests/manual/axviewer/.prev_CMakeLists.txt
new file mode 100644
index 0000000..8864fee
--- /dev/null
+++ b/tests/manual/axviewer/.prev_CMakeLists.txt
@@ -0,0 +1,69 @@
+# Generated from axviewer.pro.
+
+#####################################################################
+## axviewer Binary:
+#####################################################################
+
+qt_add_executable(axviewer
+    SOURCES
+        ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
+        ../shared/textdialog.cpp ../shared/textdialog.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../shared
+    PUBLIC_LIBRARIES
+        Qt::AxContainer
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:axviewer.pro:<TRUE>:
+# DIAGLIB = "../../../../qtbase/tests/manual/diaglib"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(axviewer CONDITION EXISTS _ss_DIAGLIB
+    SOURCES
+        ../../../../qtbase/tests/manual/diaglib/eventfilter.cpp ../../../../qtbase/tests/manual/diaglib/eventfilter.h
+        ../../../../qtbase/tests/manual/diaglib/nativewindowdump.h
+        ../../../../qtbase/tests/manual/diaglib/qwindowdump.cpp ../../../../qtbase/tests/manual/diaglib/qwindowdump.h
+        ../../../../qtbase/tests/manual/diaglib/textdump.cpp ../../../../qtbase/tests/manual/diaglib/textdump.h
+    DEFINES
+        QT_DIAG_LIB
+    INCLUDE_DIRECTORIES
+        ../../../../qtbase/tests/manual/diaglib
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (WIN32)
+    SOURCES
+        ../../../../qtbase/tests/manual/diaglib/nativewindowdump_win.cpp
+    PUBLIC_LIBRARIES
+        user32
+)
+
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (NOT (WIN32))
+    SOURCES
+        ../../../../qtbase/tests/manual/diaglib/nativewindowdump.cpp
+)
+
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (QT_FEATURE_widgets)
+    SOURCES
+        ../../../../qtbase/tests/manual/diaglib/debugproxystyle.cpp ../../../../qtbase/tests/manual/diaglib/debugproxystyle.h
+        ../../../../qtbase/tests/manual/diaglib/logwidget.cpp ../../../../qtbase/tests/manual/diaglib/logwidget.h
+        ../../../../qtbase/tests/manual/diaglib/qwidgetdump.cpp ../../../../qtbase/tests/manual/diaglib/qwidgetdump.h
+    PUBLIC_LIBRARIES
+        Qt::WidgetsPrivate
+)
+
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (QT_FEATURE_opengl)
+    SOURCES
+        ../../../../qtbase/tests/manual/diaglib/glinfo.cpp ../../../../qtbase/tests/manual/diaglib/glinfo.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+)
diff --git a/tests/manual/axviewer/CMakeLists.txt b/tests/manual/axviewer/CMakeLists.txt
index 4974bcf..f34e32c 100644
--- a/tests/manual/axviewer/CMakeLists.txt
+++ b/tests/manual/axviewer/CMakeLists.txt
@@ -4,7 +4,8 @@
 ## axviewer Binary:
 #####################################################################
 
-qt_add_manual_test(axviewer
+# qt_add_executable(axviewer # special case
+qt_add_manual_test(axviewer # special case
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
@@ -39,14 +40,14 @@ qt_extend_target(axviewer CONDITION EXISTS _ss_DIAGLIB
         Qt::GuiPrivate
 )
 
-qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (WIN32 AND NOT WINRT)
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (WIN32)
     SOURCES
         ../../../../qtbase/tests/manual/diaglib/nativewindowdump_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (NOT (WIN32 AND NOT WINRT))
+qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (NOT (WIN32))
     SOURCES
         ../../../../qtbase/tests/manual/diaglib/nativewindowdump.cpp
 )