diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
tree | 363dfd46575d147206267d854ce14747157f432e /tests/auto/widgets/dialogs/CMakeLists.txt | |
parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) |
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>
Diffstat (limited to 'tests/auto/widgets/dialogs/CMakeLists.txt')
-rw-r--r-- | tests/auto/widgets/dialogs/CMakeLists.txt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt index 508093e7ad..0c52076efe 100644 --- a/tests/auto/widgets/dialogs/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -1,19 +1,18 @@ +# Generated from dialogs.pro. + add_subdirectory(qcolordialog) add_subdirectory(qdialog) add_subdirectory(qerrormessage) -if (NOT WINRT) - add_subdirectory(qfiledialog) - add_subdirectory(qfiledialog2) - add_subdirectory(qmessagebox) -endif() -if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR NOT WIN32) - add_subdirectory(qfilesystemmodel) -endif() +add_subdirectory(qfiledialog) +add_subdirectory(qfiledialog2) add_subdirectory(qfontdialog) add_subdirectory(qinputdialog) +add_subdirectory(qmessagebox) add_subdirectory(qprogressdialog) -if (QT_FEATURE_private_tests) +add_subdirectory(qwizard) +if(NOT MINGW) + add_subdirectory(qfilesystemmodel) +endif() +if(QT_FEATURE_private_tests) add_subdirectory(qsidebar) endif() -add_subdirectory(qwizard) - |