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/global/qlogging/CMakeLists.txt | 26 +++++++++++------------
 tests/auto/corelib/global/qlogging/qlogging.pro   |  6 ++----
 tests/auto/corelib/global/qlogging/test/test.pro  |  6 +++---
 3 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'tests/auto/corelib/global/qlogging')

diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
index 7c74656215..ce9235f91e 100644
--- a/tests/auto/corelib/global/qlogging/CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -1,19 +1,17 @@
-if(NOT WINRT)
-    add_qt_executable(qlogging_helper
-        NO_INSTALL # special case
-        OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
-        SOURCES app/main.cpp
-        DEFINES QT_MESSAGELOGCONTEXT
-        LIBRARIES Qt::Core)
+add_qt_executable(qlogging_helper
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES app/main.cpp
+    DEFINES QT_MESSAGELOGCONTEXT
+    LIBRARIES Qt::Core)
 
-    #special case begin
-    # Fixes required for the backtrace stack to be correct
-    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
-        target_link_options(qlogging_helper PRIVATE -rdynamic)
-    endif()
-    set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
-    # special case end
+#special case begin
+# Fixes required for the backtrace stack to be correct
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
+    target_link_options(qlogging_helper PRIVATE -rdynamic)
 endif()
+set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
+# special case end
 
 add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
     DEFINES
diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro
index bbe75297d5..c81e257a2d 100644
--- a/tests/auto/corelib/global/qlogging/qlogging.pro
+++ b/tests/auto/corelib/global/qlogging/qlogging.pro
@@ -1,8 +1,6 @@
 TEMPLATE = subdirs
 
-!winrt {
-    test.depends = app
-    SUBDIRS += app
-}
+test.depends = app
+SUBDIRS += app
 
 SUBDIRS += test
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 81445247e0..c6c5950ff1 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -4,14 +4,14 @@ qtConfig(c++14): CONFIG += c++14
 debug_and_release {
     CONFIG(debug, debug|release) {
         TARGET = ../../debug/tst_qlogging
-        !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
+        !android: TEST_HELPER_INSTALLS = ../debug/helper
     } else {
         TARGET = ../../release/tst_qlogging
-        !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
+        !android: TEST_HELPER_INSTALLS = ../release/helper
     }
 } else {
     TARGET = ../tst_qlogging
-    !android:!winrt: TEST_HELPER_INSTALLS = ../helper
+    !android: TEST_HELPER_INSTALLS = ../helper
 }
 
 QT = core testlib
-- 
cgit v1.2.3