diff options
| -rw-r--r-- | tests/auto/corelib/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/auto/corelib/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | tests/auto/dbus/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | tests/auto/gui/.prev_CMakeLists.txt | 19 | ||||
| -rw-r--r-- | tests/auto/gui/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | tests/auto/network/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/printsupport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/testlib/CMakeLists.txt | 8 |
10 files changed, 89 insertions, 42 deletions
diff --git a/tests/auto/corelib/.prev_CMakeLists.txt b/tests/auto/corelib/.prev_CMakeLists.txt new file mode 100644 index 0000000000..906e496da9 --- /dev/null +++ b/tests/auto/corelib/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from corelib.pro. + +add_subdirectory(kernel) +if(NOT APPLE_UIKIT) + add_subdirectory(animation) + add_subdirectory(codecs) + add_subdirectory(global) + add_subdirectory(io) + add_subdirectory(itemmodels) + add_subdirectory(mimetypes) + add_subdirectory(plugin) + add_subdirectory(serialization) + add_subdirectory(statemachine) + add_subdirectory(thread) + add_subdirectory(time) + add_subdirectory(tools) +endif() diff --git a/tests/auto/corelib/CMakeLists.txt b/tests/auto/corelib/CMakeLists.txt index 987df6cb4d..cb1228a1a0 100644 --- a/tests/auto/corelib/CMakeLists.txt +++ b/tests/auto/corelib/CMakeLists.txt @@ -1,13 +1,17 @@ -add_subdirectory(animation) -add_subdirectory(codecs) -add_subdirectory(global) -add_subdirectory(io) -add_subdirectory(itemmodels) -add_subdirectory(kernel) -add_subdirectory(mimetypes) -add_subdirectory(serialization) -add_subdirectory(statemachine) -add_subdirectory(thread) -add_subdirectory(tools) -add_subdirectory(time) +# Generated from corelib.pro. +add_subdirectory(kernel) +if(NOT APPLE_UIKIT) + add_subdirectory(animation) + add_subdirectory(codecs) + add_subdirectory(global) + add_subdirectory(io) + add_subdirectory(itemmodels) + add_subdirectory(mimetypes) + # add_subdirectory(plugin) # special case missing project + add_subdirectory(serialization) + add_subdirectory(statemachine) + add_subdirectory(thread) + add_subdirectory(time) + add_subdirectory(tools) +endif() diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt index ed61a5be9e..1b5022454a 100644 --- a/tests/auto/dbus/CMakeLists.txt +++ b/tests/auto/dbus/CMakeLists.txt @@ -16,17 +16,14 @@ add_subdirectory(qdbusreply) add_subdirectory(qdbusservicewatcher) add_subdirectory(qdbustype) add_subdirectory(qdbusthreading) - if(QT_FEATURE_process) add_subdirectory(qdbusabstractadaptor) add_subdirectory(qdbusabstractinterface) add_subdirectory(qdbusinterface) - - if(QT_FEATURE_private_tests) - add_subdirectory(qdbusmarshall) - endif() endif() - -if(QT_FEATURE_xml) +if(QT_FEATURE_private_tests AND QT_FEATURE_process) + add_subdirectory(qdbusmarshall) +endif() +if(TARGET Qt::Xml) add_subdirectory(qdbusxmlparser) endif() diff --git a/tests/auto/gui/.prev_CMakeLists.txt b/tests/auto/gui/.prev_CMakeLists.txt new file mode 100644 index 0000000000..8cbfa78aad --- /dev/null +++ b/tests/auto/gui/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from gui.pro. + +add_subdirectory(kernel) +if(NOT APPLE_UIKIT) + add_subdirectory(image) + add_subdirectory(math3d) + add_subdirectory(painting) + add_subdirectory(text) + add_subdirectory(util) + add_subdirectory(itemmodels) + add_subdirectory(rhi) +endif() +if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT) + add_subdirectory(qopenglconfig) + add_subdirectory(qopengl) +endif() +if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT) + add_subdirectory(qvulkan) +endif() diff --git a/tests/auto/gui/CMakeLists.txt b/tests/auto/gui/CMakeLists.txt index 8be8abea63..fd4cf176ab 100644 --- a/tests/auto/gui/CMakeLists.txt +++ b/tests/auto/gui/CMakeLists.txt @@ -1,19 +1,19 @@ # Generated from gui.pro. -add_subdirectory("kernel") - +add_subdirectory(kernel) if(NOT APPLE_UIKIT) - add_subdirectory("image") - add_subdirectory("math3d") - add_subdirectory("painting") - if (QT_FEATURE_opengl AND NOT WINRT) - # missing CMakeLists.txt: add_subdirectory("qopenglconfig") - # missing CMakeLists.txt: add_subdirectory("qopengl") - endif() - # if (QT_FEATURE_vulkan) - # add_subdirectory("qvulkan") - # endif() - # add_subdirectory("text") - add_subdirectory("util") - add_subdirectory("itemmodels") + add_subdirectory(image) + add_subdirectory(math3d) + add_subdirectory(painting) + # add_subdirectory(text) # special case missing project + add_subdirectory(util) + add_subdirectory(itemmodels) + # add_subdirectory(rhi) # special case missing project +endif() +if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT) + # add_subdirectory(qopenglconfig) # special case missing project + # add_subdirectory(qopengl) # special case missing project +endif() +if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT) + # add_subdirectory(qvulkan) # special case missing project endif() diff --git a/tests/auto/network/CMakeLists.txt b/tests/auto/network/CMakeLists.txt index 58b90c2a2a..9ae48630cb 100644 --- a/tests/auto/network/CMakeLists.txt +++ b/tests/auto/network/CMakeLists.txt @@ -5,9 +5,3 @@ add_subdirectory(bearer) add_subdirectory(kernel) add_subdirectory(ssl) add_subdirectory(socket) - -if(WIN32) -endif() - -if(WIN32 OR APPLE) -endif() diff --git a/tests/auto/printsupport/CMakeLists.txt b/tests/auto/printsupport/CMakeLists.txt index 791d6e4807..633c7d5e71 100644 --- a/tests/auto/printsupport/CMakeLists.txt +++ b/tests/auto/printsupport/CMakeLists.txt @@ -1,2 +1,4 @@ +# Generated from printsupport.pro. + add_subdirectory(dialogs) add_subdirectory(kernel) diff --git a/tests/auto/sql/CMakeLists.txt b/tests/auto/sql/CMakeLists.txt index 7d4cd486b4..415d7598ae 100644 --- a/tests/auto/sql/CMakeLists.txt +++ b/tests/auto/sql/CMakeLists.txt @@ -1,2 +1,4 @@ +# Generated from sql.pro. + add_subdirectory(kernel) add_subdirectory(models) diff --git a/tests/auto/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/.prev_CMakeLists.txt new file mode 100644 index 0000000000..194852f91c --- /dev/null +++ b/tests/auto/testlib/.prev_CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from testlib.pro. + +add_subdirectory(outformat) +add_subdirectory(qsignalspy) +add_subdirectory(selftests) +if(TARGET Qt::Widgets) + add_subdirectory(qabstractitemmodeltester) +endif() diff --git a/tests/auto/testlib/CMakeLists.txt b/tests/auto/testlib/CMakeLists.txt index a87e2203f9..fe80927327 100644 --- a/tests/auto/testlib/CMakeLists.txt +++ b/tests/auto/testlib/CMakeLists.txt @@ -1,4 +1,8 @@ -add_subdirectory(qabstractitemmodeltester) +# Generated from testlib.pro. + +# add_subdirectory(outformat) # special case missing project add_subdirectory(qsignalspy) add_subdirectory(selftests) - +if(TARGET Qt::Widgets) + add_subdirectory(qabstractitemmodeltester) +endif() |