summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/moc/CMakeLists.txt
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 10:16:58 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-23 16:59:06 +0200
commit403213240c7b2dc09378e1cb8c147131e368f90c (patch)
treeff86910332629fe5e2fab59a30fb863a5febb366 /tests/auto/tools/moc/CMakeLists.txt
parente0c62a48b8a826a46a143e57e94b2a0ea73c7cae (diff)
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/tools/moc/CMakeLists.txt')
-rw-r--r--tests/auto/tools/moc/CMakeLists.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt
index db953ab735..b34a4d0a3f 100644
--- a/tests/auto/tools/moc/CMakeLists.txt
+++ b/tests/auto/tools/moc/CMakeLists.txt
@@ -60,7 +60,7 @@ qt_wrap_cpp(comparison_relevant_moc_list ${JSON_HEADERS}
list(TRANSFORM comparison_relevant_moc_list APPEND ".json" OUTPUT_VARIABLE moc_json_files)
-qt_add_test(tst_moc
+qt_internal_add_test(tst_moc
SOURCES
cxx-attributes.h
tst_moc.cpp
@@ -77,9 +77,9 @@ qt_add_test(tst_moc
EXCEPTIONS
)
-qt_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate)
+qt_internal_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate)
-qt_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING
+qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING
DEFINES
MOC_CROSS_COMPILED
)
@@ -88,34 +88,34 @@ if (UNIX AND (CLANG OR GCC OR ICC))
qt_wrap_cpp(os9_moc os9-newlines.h)
endif()
-qt_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC)
+qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC)
SOURCES
os9-newlines.h
win-newlines.h
${os9_moc}
)
-qt_extend_target(tst_moc CONDITION CLANG OR GCC
+qt_internal_extend_target(tst_moc CONDITION CLANG OR GCC
SOURCES
dollars.h
)
-qt_extend_target(tst_moc CONDITION TARGET Qt::DBus
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::DBus
PUBLIC_LIBRARIES
Qt::DBus
)
-qt_extend_target(tst_moc CONDITION TARGET Qt::Concurrent
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Concurrent
PUBLIC_LIBRARIES
Qt::Concurrent
)
-qt_extend_target(tst_moc CONDITION TARGET Qt::Network
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Network
PUBLIC_LIBRARIES
Qt::Network
)
-qt_extend_target(tst_moc CONDITION TARGET Qt::Sql
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Sql
PUBLIC_LIBRARIES
Qt::Sql
)