diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:34:17 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:39 +0200 |
| commit | db397d11130639abae1b1438b0685db2c75db330 (patch) | |
| tree | a97939cbefc3779e8a3e1ff339ad37f17806a8d7 /tests/auto/corelib/mimetypes | |
| parent | e9a328bc0e56b429a370b13c8e0b4790916cebde (diff) | |
CMake: Regenerate subdir test projects
And generate a few more test projects that were missing.
Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/mimetypes')
| -rw-r--r-- | tests/auto/corelib/mimetypes/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/mimetypes/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt | 8 |
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() |