From dfa5303342ca25cf9ecb8679b9454cf1fefa3c86 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 25 Sep 2020 14:46:19 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: Ibd1d0f4069be8e247b607e86cf31ffa57f542bd9 Reviewed-by: Cristian Adam --- tests/auto/qml/qqmlparser/.prev_CMakeLists.txt | 4 ++-- tests/auto/qml/qqmlparser/CMakeLists.txt | 4 ++-- tests/auto/quick/examples/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/qml/qqmlparser/.prev_CMakeLists.txt b/tests/auto/qml/qqmlparser/.prev_CMakeLists.txt index 7c788780..29f39966 100644 --- a/tests/auto/qml/qqmlparser/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlparser Test: ##################################################################### -qt_add_test(tst_qqmlparser +qt_internal_add_test(tst_qqmlparser SOURCES tst_qqmlparser.cpp DEFINES @@ -17,7 +17,7 @@ qt_add_test(tst_qqmlparser ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING +qt_internal_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING DEFINES QTEST_CROSS_COMPILED ) diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index 9f2d74d0..7d3cc503 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlparser Test: ##################################################################### -qt_add_test(tst_qqmlparser_doc # special case +qt_internal_add_test(tst_qqmlparser_doc # special case SOURCES tst_qqmlparser.cpp DEFINES @@ -17,7 +17,7 @@ qt_add_test(tst_qqmlparser_doc # special case ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlparser_doc CONDITION CMAKE_CROSSCOMPILING # special case +qt_internal_extend_target(tst_qqmlparser_doc CONDITION CMAKE_CROSSCOMPILING # special case DEFINES QTEST_CROSS_COMPILED ) diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index 15d74848..264ec50c 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_examples Test: ##################################################################### -qt_add_test(tst_examples +qt_internal_add_test(tst_examples SOURCES tst_examples.cpp DEFINES @@ -23,7 +23,7 @@ qt_add_test(tst_examples ## Scopes: ##################################################################### -qt_extend_target(tst_examples CONDITION NOT TARGET Qt::XmlPatterns +qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt::XmlPatterns DEFINES QT_NO_XMLPATTERNS ) -- cgit v1.2.1