summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-04 12:39:27 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-04 23:21:00 +0200
commit0cbd307d6af15b7680347358bef6255af432cad8 (patch)
tree23bdcccc7fd32f3b15167aeead65614133905f20 /tests/auto/other
parent9b1190fd68ffd8012fcb2ba87d403c75b99ebdce (diff)
CMake: Regenerate tests/auto/other project
Change-Id: I0dbcef3c918b9502528bf2fe0907a7582dcde0ea Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tests/auto/other')
-rw-r--r--tests/auto/other/.prev_CMakeLists.txt49
-rw-r--r--tests/auto/other/CMakeLists.txt4
2 files changed, 51 insertions, 2 deletions
diff --git a/tests/auto/other/.prev_CMakeLists.txt b/tests/auto/other/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..74ea69ee0e
--- /dev/null
+++ b/tests/auto/other/.prev_CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from other.pro.
+
+if(NOT CMAKE_CROSSCOMPILING)
+ add_subdirectory(compiler)
+ add_subdirectory(atwrapper)
+endif()
+if(TARGET Qt::Widgets)
+ add_subdirectory(gestures)
+ add_subdirectory(languagechange)
+ add_subdirectory(qfocusevent)
+ add_subdirectory(qsharedpointer_and_qwidget)
+ add_subdirectory(windowsmobile)
+endif()
+if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
+ add_subdirectory(lancelot)
+ add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
+endif()
+if(MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+ add_subdirectory(macgui)
+ add_subdirectory(macplist)
+ add_subdirectory(qaccessibilitymac)
+endif()
+if(TARGET Qt::Gui)
+ add_subdirectory(qcomplextext)
+endif()
+if(QT_FEATURE_process AND TARGET Qt::Gui)
+ add_subdirectory(qprocess_and_guieventloop)
+endif()
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT WINRT)
+ add_subdirectory(qaccessibility)
+endif()
+if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+ add_subdirectory(qaccessibilitylinux)
+endif()
+if(TARGET Qt::Network AND NOT WINRT)
+ add_subdirectory(networkselftest)
+endif()
+if(MACOS AND TARGET Qt::Gui)
+ add_subdirectory(macnativeevents)
+endif()
+if(embedded)
+ add_subdirectory(qdirectpainter)
+endif()
+if(ANDROID)
+ add_subdirectory(android)
+endif()
+if(QT_FEATURE_xkbcommon AND TARGET Qt::Gui)
+ add_subdirectory(xkbkeyboard)
+endif()
diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt
index 5940048480..808afeff35 100644
--- a/tests/auto/other/CMakeLists.txt
+++ b/tests/auto/other/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from other.pro.
-if(NOT cross_compile)
+if(NOT CMAKE_CROSSCOMPILING)
add_subdirectory(compiler)
# add_subdirectory(atwrapper) <- does not exist # special case
endif()
@@ -44,6 +44,6 @@ endif()
if(ANDROID)
add_subdirectory(android)
endif()
-if(QT_FEATURE_xkbcommon)
+if(QT_FEATURE_xkbcommon AND TARGET Qt::Gui)
add_subdirectory(xkbkeyboard)
endif()