summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/mimetypes
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/mimetypes')
-rw-r--r--tests/auto/corelib/mimetypes/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/corelib/mimetypes/CMakeLists.txt12
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt8
3 files changed, 11 insertions, 15 deletions
diff --git a/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..00c7dd7df2
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from mimetypes.pro.
+
+if(QT_FEATURE_private_tests)
+ add_subdirectory(qmimetype)
+endif()
+add_subdirectory(qmimedatabase)
diff --git a/tests/auto/corelib/mimetypes/CMakeLists.txt b/tests/auto/corelib/mimetypes/CMakeLists.txt
index ea0463de36..00c7dd7df2 100644
--- a/tests/auto/corelib/mimetypes/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/CMakeLists.txt
@@ -1,14 +1,6 @@
# Generated from mimetypes.pro.
-# special case begin
-if(FEATURE_private_tests)
-# special case end
+if(QT_FEATURE_private_tests)
add_subdirectory(qmimetype)
- add_subdirectory(qmimedatabase)
-# special case begin
-endif()
-# special case end
-
-if(NOT QT_FEATURE_private_tests)
- ### remove_subdirectory("qmimetype")
endif()
+add_subdirectory(qmimedatabase)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
index 6661952a68..14086efd59 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
@@ -1,10 +1,8 @@
# Generated from qmimedatabase.pro.
-
if(TARGET Qt::Concurrent)
add_subdirectory(qmimedatabase-xml)
-
- if(UNIX AND NOT APPLE AND NOT QNX)
- add_subdirectory(qmimedatabase-cache)
- endif()
+endif()
+if(TARGET Qt::Concurrent AND UNIX AND NOT APPLE AND NOT QNX)
+ add_subdirectory(qmimedatabase-cache)
endif()