From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001 From: Oliver Wolff 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ø --- tests/auto/gui/kernel/qclipboard/CMakeLists.txt | 6 ++---- tests/auto/gui/kernel/qclipboard/qclipboard.pro | 2 +- tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt | 2 +- tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt | 2 +- tests/auto/gui/kernel/qclipboard/test/test.pro | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/auto/gui/kernel/qclipboard') diff --git a/tests/auto/gui/kernel/qclipboard/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/CMakeLists.txt index b795d32520..05eba972d6 100644 --- a/tests/auto/gui/kernel/qclipboard/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/CMakeLists.txt @@ -1,7 +1,5 @@ # Generated from qclipboard.pro. +add_subdirectory(copier) +add_subdirectory(paster) add_subdirectory(test) -if(NOT WINRT) - add_subdirectory(copier) - add_subdirectory(paster) -endif() diff --git a/tests/auto/gui/kernel/qclipboard/qclipboard.pro b/tests/auto/gui/kernel/qclipboard/qclipboard.pro index b9fd2080e7..d97c58dea0 100644 --- a/tests/auto/gui/kernel/qclipboard/qclipboard.pro +++ b/tests/auto/gui/kernel/qclipboard/qclipboard.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -!winrt: SUBDIRS = copier paster +SUBDIRS = copier paster test.depends += $$SUBDIRS SUBDIRS += test diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt index 36d9f7b00c..e7c1313c7b 100644 --- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt @@ -20,5 +20,5 @@ extend_target(tst_qclipboard CONDITION MACOS ${FWAppKit} ) -#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster" diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt index 36d9f7b00c..e7c1313c7b 100644 --- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt @@ -20,5 +20,5 @@ extend_target(tst_qclipboard CONDITION MACOS ${FWAppKit} ) -#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster" diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro index 84e80d62e6..3a4ed3a7bc 100644 --- a/tests/auto/gui/kernel/qclipboard/test/test.pro +++ b/tests/auto/gui/kernel/qclipboard/test/test.pro @@ -13,6 +13,6 @@ win32 { } } -!android:!winrt: TEST_HELPER_INSTALLS = \ +!android: TEST_HELPER_INSTALLS = \ ../copier/copier \ ../paster/paster -- cgit v1.2.3