diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2020-08-05 11:31:58 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2020-08-06 07:40:04 +0200 |
commit | c14e73f3c1016a38c8f95de3e9758195a2a4cef7 (patch) | |
tree | c7fd82bf2e4e9feb281384c5171f950d315d8de9 /tests | |
parent | 005f6f0bb3139a9d90daabab06bab2b346eb9de4 (diff) |
Remove winrt specific code
Task-number: QTBUG-84434
Change-Id: I9c3a661e490f3dccea893e213939953465d8970e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/auto.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index bdf5c6b16..af1c24b03 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -17,6 +17,6 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) endif() add_subdirectory(cmake) add_subdirectory(installed_cmake) -if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT) +if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(windeployqt) endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index ab374e67a..85bbc931d 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -19,6 +19,6 @@ endif() #add_subdirectory(cmake) #add_subdirectory(installed_cmake) # special case end -if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT) +if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(windeployqt) endif() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 0d3966a7e..486b824bc 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -30,4 +30,4 @@ cross_compile:SUBDIRS -= qhelpcontentmodel qhelpenginecore qhelpindexmodel qhelp qhelpprojectdata \ !qtConfig(process): SUBDIRS -= qtattributionsscanner linguist qtdiag windeployqt -!win32|winrt: SUBDIRS -= windeployqt +!win32: SUBDIRS -= windeployqt |