From ed65d1ab49e6f5537b086178f9f9d14fc190b663 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 23 Sep 2020 11:34:07 +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: I4a690095fcd4b1141550de86b6820ae2dd579429 Reviewed-by: Cristian Adam --- tests/auto/accessibility/CMakeLists.txt | 6 +++--- tests/auto/controls/basic/CMakeLists.txt | 2 +- tests/auto/controls/fusion/CMakeLists.txt | 2 +- tests/auto/controls/imagine/CMakeLists.txt | 2 +- tests/auto/controls/material/CMakeLists.txt | 2 +- tests/auto/controls/universal/CMakeLists.txt | 2 +- tests/auto/cursor/CMakeLists.txt | 6 +++--- tests/auto/customization/CMakeLists.txt | 6 +++--- tests/auto/designer/CMakeLists.txt | 2 +- tests/auto/focus/CMakeLists.txt | 6 +++--- tests/auto/font/CMakeLists.txt | 6 +++--- tests/auto/palette/CMakeLists.txt | 8 ++++---- tests/auto/platform/CMakeLists.txt | 2 +- tests/auto/pressandhold/CMakeLists.txt | 2 +- tests/auto/qquickapplicationwindow/CMakeLists.txt | 6 +++--- tests/auto/qquickcolor/CMakeLists.txt | 2 +- tests/auto/qquickcontrol/CMakeLists.txt | 6 +++--- tests/auto/qquickdrawer/CMakeLists.txt | 6 +++--- tests/auto/qquickheaderview/CMakeLists.txt | 6 +++--- tests/auto/qquickiconimage/CMakeLists.txt | 10 +++++----- tests/auto/qquickiconlabel/CMakeLists.txt | 6 +++--- tests/auto/qquickimaginestyle/CMakeLists.txt | 4 ++-- tests/auto/qquickmaterialstyle/CMakeLists.txt | 4 ++-- tests/auto/qquickmaterialstyleconf/CMakeLists.txt | 8 ++++---- tests/auto/qquickmenu/CMakeLists.txt | 6 +++--- tests/auto/qquickmenubar/CMakeLists.txt | 6 +++--- tests/auto/qquickninepatchimage/CMakeLists.txt | 6 +++--- tests/auto/qquickpopup/CMakeLists.txt | 6 +++--- tests/auto/qquickstyle/CMakeLists.txt | 8 ++++---- tests/auto/qquickuniversalstyle/CMakeLists.txt | 4 ++-- tests/auto/qquickuniversalstyleconf/CMakeLists.txt | 8 ++++---- tests/auto/revisions/CMakeLists.txt | 2 +- tests/auto/sanity/CMakeLists.txt | 6 +++--- tests/auto/snippets/CMakeLists.txt | 4 ++-- tests/auto/styleimports/.prev_CMakeLists.txt | 8 ++++---- tests/auto/styleimports/CMakeLists.txt | 8 ++++---- tests/auto/styleimportscompiletimematerial/CMakeLists.txt | 6 +++--- tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt | 6 +++--- tests/auto/translation/CMakeLists.txt | 8 ++++---- tests/benchmarks/creationtime/CMakeLists.txt | 6 +++--- tests/benchmarks/objectcount/CMakeLists.txt | 6 +++--- 41 files changed, 108 insertions(+), 108 deletions(-) (limited to 'tests') diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt index 4ba2c566..fe2a35d6 100644 --- a/tests/auto/accessibility/CMakeLists.txt +++ b/tests/auto/accessibility/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_accessibility +qt_internal_add_test(tst_accessibility SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -42,12 +42,12 @@ qt_add_test(tst_accessibility ## Scopes: ##################################################################### -qt_extend_target(tst_accessibility CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_accessibility CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/controls/basic/CMakeLists.txt b/tests/auto/controls/basic/CMakeLists.txt index a7a4e29c..55112e1e 100644 --- a/tests/auto/controls/basic/CMakeLists.txt +++ b/tests/auto/controls/basic/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_basic +qt_internal_add_test(tst_basic GUI QMLTEST SOURCES diff --git a/tests/auto/controls/fusion/CMakeLists.txt b/tests/auto/controls/fusion/CMakeLists.txt index fd348526..03c52605 100644 --- a/tests/auto/controls/fusion/CMakeLists.txt +++ b/tests/auto/controls/fusion/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_fusion +qt_internal_add_test(tst_fusion GUI QMLTEST SOURCES diff --git a/tests/auto/controls/imagine/CMakeLists.txt b/tests/auto/controls/imagine/CMakeLists.txt index 9d7f2e3a..faef2e06 100644 --- a/tests/auto/controls/imagine/CMakeLists.txt +++ b/tests/auto/controls/imagine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_imagine +qt_internal_add_test(tst_imagine GUI QMLTEST SOURCES diff --git a/tests/auto/controls/material/CMakeLists.txt b/tests/auto/controls/material/CMakeLists.txt index 04c2655a..b8505b9b 100644 --- a/tests/auto/controls/material/CMakeLists.txt +++ b/tests/auto/controls/material/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_material +qt_internal_add_test(tst_material GUI QMLTEST SOURCES diff --git a/tests/auto/controls/universal/CMakeLists.txt b/tests/auto/controls/universal/CMakeLists.txt index e5576020..5f9024cd 100644 --- a/tests/auto/controls/universal/CMakeLists.txt +++ b/tests/auto/controls/universal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_universal +qt_internal_add_test(tst_universal GUI QMLTEST SOURCES diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt index 07d8a5f3..f7a22928 100644 --- a/tests/auto/cursor/CMakeLists.txt +++ b/tests/auto/cursor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_cursor +qt_internal_add_test(tst_cursor SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_cursor ## Scopes: ##################################################################### -qt_extend_target(tst_cursor CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_cursor CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt index 0ec56d9d..70a7b88c 100644 --- a/tests/auto/customization/CMakeLists.txt +++ b/tests/auto/customization/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_customization +qt_internal_add_test(tst_customization SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -34,12 +34,12 @@ qt_add_test(tst_customization ## Scopes: ##################################################################### -qt_extend_target(tst_customization CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_customization CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt index 59e7c5a0..50331f8f 100644 --- a/tests/auto/designer/CMakeLists.txt +++ b/tests/auto/designer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_designer Test: ##################################################################### -qt_add_test(tst_designer +qt_internal_add_test(tst_designer SOURCES tst_designer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt index 3e8234e9..404dcfa4 100644 --- a/tests/auto/focus/CMakeLists.txt +++ b/tests/auto/focus/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_focus +qt_internal_add_test(tst_focus SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -34,12 +34,12 @@ qt_add_test(tst_focus ## Scopes: ##################################################################### -qt_extend_target(tst_focus CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_focus CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt index 8529adb8..5cc92d88 100644 --- a/tests/auto/font/CMakeLists.txt +++ b/tests/auto/font/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_font +qt_internal_add_test(tst_font SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_font ## Scopes: ##################################################################### -qt_extend_target(tst_font CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_font CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt index 33f8b86b..6702ac8a 100644 --- a/tests/auto/palette/CMakeLists.txt +++ b/tests/auto/palette/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_palette +qt_internal_add_test(tst_palette SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -36,7 +36,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_palette "qmake_immediate" +qt_internal_add_resource(tst_palette "qmake_immediate" PREFIX "/" FILES @@ -50,12 +50,12 @@ qt_add_resource(tst_palette "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_palette CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_palette CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/platform/CMakeLists.txt b/tests/auto/platform/CMakeLists.txt index ec4e54ee..6633de5c 100644 --- a/tests/auto/platform/CMakeLists.txt +++ b/tests/auto/platform/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_platform +qt_internal_add_test(tst_platform GUI QMLTEST SOURCES diff --git a/tests/auto/pressandhold/CMakeLists.txt b/tests/auto/pressandhold/CMakeLists.txt index 32793510..926d446f 100644 --- a/tests/auto/pressandhold/CMakeLists.txt +++ b/tests/auto/pressandhold/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_pressandhold Test: ##################################################################### -qt_add_test(tst_pressandhold +qt_internal_add_test(tst_pressandhold SOURCES tst_pressandhold.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt index 6fa2e692..20268703 100644 --- a/tests/auto/qquickapplicationwindow/CMakeLists.txt +++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickapplicationwindow +qt_internal_add_test(tst_qquickapplicationwindow SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickapplicationwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickcolor/CMakeLists.txt b/tests/auto/qquickcolor/CMakeLists.txt index bf660d10..2cbbe9eb 100644 --- a/tests/auto/qquickcolor/CMakeLists.txt +++ b/tests/auto/qquickcolor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcolor +qt_internal_add_test(tst_qquickcolor GUI QMLTEST SOURCES diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt index 0599ce32..5d6eefd2 100644 --- a/tests/auto/qquickcontrol/CMakeLists.txt +++ b/tests/auto/qquickcontrol/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcontrol +qt_internal_add_test(tst_qquickcontrol SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickcontrol ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt index e428a86c..1c2342f0 100644 --- a/tests/auto/qquickdrawer/CMakeLists.txt +++ b/tests/auto/qquickdrawer/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdrawer +qt_internal_add_test(tst_qquickdrawer SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickdrawer ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/qquickheaderview/CMakeLists.txt index fe604d5c..dfcaa452 100644 --- a/tests/auto/qquickheaderview/CMakeLists.txt +++ b/tests/auto/qquickheaderview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickheaderview +qt_internal_add_test(tst_qquickheaderview SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickheaderview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index 2ee0d295..fdad6ef9 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickiconimage +qt_internal_add_test(tst_qquickiconimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -57,7 +57,7 @@ set(resources_resource_files "icons/testtheme/index.theme" ) -qt_add_resource(tst_qquickiconimage "resources" +qt_internal_add_resource(tst_qquickiconimage "resources" PREFIX "/" FILES @@ -68,17 +68,17 @@ qt_add_resource(tst_qquickiconimage "resources" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg +qt_internal_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg PUBLIC_LIBRARIES Qt::Svg ) -qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt index 97e115a5..ffa084f7 100644 --- a/tests/auto/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/qquickiconlabel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickiconlabel +qt_internal_add_test(tst_qquickiconlabel SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -39,12 +39,12 @@ qt_add_test(tst_qquickiconlabel ## Scopes: ##################################################################### -qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt index 7a3ffe08..568c4441 100644 --- a/tests/auto/qquickimaginestyle/CMakeLists.txt +++ b/tests/auto/qquickimaginestyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickimaginestyle +qt_internal_add_test(tst_qquickimaginestyle GUI QMLTEST SOURCES @@ -28,7 +28,7 @@ set(qmake_immediate_resource_files "test-assets/button-background-2.png" ) -qt_add_resource(tst_qquickimaginestyle "qmake_immediate" +qt_internal_add_resource(tst_qquickimaginestyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyle/CMakeLists.txt b/tests/auto/qquickmaterialstyle/CMakeLists.txt index 2b213448..332f376d 100644 --- a/tests/auto/qquickmaterialstyle/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaterialstyle +qt_internal_add_test(tst_qquickmaterialstyle GUI QMLTEST SOURCES @@ -26,7 +26,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickmaterialstyle "qmake_immediate" +qt_internal_add_resource(tst_qquickmaterialstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt index fa0dde32..1244961a 100644 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaterialstyleconf +qt_internal_add_test(tst_qquickmaterialstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qquickmaterialstyleconf_resource_files "variant-normal.conf" ) -qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" +qt_internal_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" PREFIX "/" FILES @@ -52,12 +52,12 @@ qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt index 5d6b9ffa..702c5747 100644 --- a/tests/auto/qquickmenu/CMakeLists.txt +++ b/tests/auto/qquickmenu/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmenu +qt_internal_add_test(tst_qquickmenu SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickmenu ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt index 72660ceb..c6043f87 100644 --- a/tests/auto/qquickmenubar/CMakeLists.txt +++ b/tests/auto/qquickmenubar/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmenubar +qt_internal_add_test(tst_qquickmenubar SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickmenubar ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt index 4372cbce..83cf364b 100644 --- a/tests/auto/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/qquickninepatchimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickninepatchimage +qt_internal_add_test(tst_qquickninepatchimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -44,12 +44,12 @@ qt_add_test(tst_qquickninepatchimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt index 43d6d778..9b736f80 100644 --- a/tests/auto/qquickpopup/CMakeLists.txt +++ b/tests/auto/qquickpopup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpopup +qt_internal_add_test(tst_qquickpopup SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickpopup ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt index 71e58cca..153cf19e 100644 --- a/tests/auto/qquickstyle/CMakeLists.txt +++ b/tests/auto/qquickstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickstyle +qt_internal_add_test(tst_qquickstyle SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -41,7 +41,7 @@ set(qmake_custom_resource_files "data/Custom/qmldir" ) -qt_add_resource(tst_qquickstyle "qmake_custom" +qt_internal_add_resource(tst_qquickstyle "qmake_custom" PREFIX "/" FILES @@ -55,12 +55,12 @@ qt_add_resource(tst_qquickstyle "qmake_custom" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickuniversalstyle/CMakeLists.txt b/tests/auto/qquickuniversalstyle/CMakeLists.txt index 99816bef..43d4c10d 100644 --- a/tests/auto/qquickuniversalstyle/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickuniversalstyle +qt_internal_add_test(tst_qquickuniversalstyle GUI QMLTEST SOURCES @@ -25,7 +25,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickuniversalstyle "qmake_immediate" +qt_internal_add_resource(tst_qquickuniversalstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt index 1125e75b..ab754043 100644 --- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickuniversalstyleconf +qt_internal_add_test(tst_qquickuniversalstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -36,7 +36,7 @@ set(qquickuniversalstyleconf_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" +qt_internal_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" PREFIX "/" FILES @@ -50,12 +50,12 @@ qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/revisions/CMakeLists.txt b/tests/auto/revisions/CMakeLists.txt index fbed2b6a..79a0f8e3 100644 --- a/tests/auto/revisions/CMakeLists.txt +++ b/tests/auto/revisions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_revisions Test: ##################################################################### -qt_add_test(tst_revisions +qt_internal_add_test(tst_revisions SOURCES tst_revisions.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt index fb2f2014..63a8eeb7 100644 --- a/tests/auto/sanity/CMakeLists.txt +++ b/tests/auto/sanity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sanity Test: ##################################################################### -qt_add_test(tst_sanity +qt_internal_add_test(tst_sanity SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -32,12 +32,12 @@ qt_add_test(tst_sanity ## Scopes: ##################################################################### -qt_extend_target(tst_sanity CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_sanity CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt index 6a9bbc5f..cecbbc79 100644 --- a/tests/auto/snippets/CMakeLists.txt +++ b/tests/auto/snippets/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_snippets +qt_internal_add_test(tst_snippets SOURCES tst_snippets.cpp DEFINES @@ -28,7 +28,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_snippets "qmake_immediate" +qt_internal_add_resource(tst_snippets "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/styleimports/.prev_CMakeLists.txt b/tests/auto/styleimports/.prev_CMakeLists.txt index 108a2054..4d614767 100644 --- a/tests/auto/styleimports/.prev_CMakeLists.txt +++ b/tests/auto/styleimports/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "resources/ResourceStyle/qmldir" ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt index 27ba24e7..94e7bce8 100644 --- a/tests/auto/styleimports/CMakeLists.txt +++ b/tests/auto/styleimports/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "ResourceStyle/qmldir" # special case ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt index af167d0c..9201503b 100644 --- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimportscompiletimematerial +qt_internal_add_test(tst_styleimportscompiletimematerial SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_styleimportscompiletimematerial ## Scopes: ##################################################################### -qt_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt index 4a59c682..57fbc1d3 100644 --- a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimportscompiletimeqmlonly +qt_internal_add_test(tst_styleimportscompiletimeqmlonly SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_styleimportscompiletimeqmlonly ## Scopes: ##################################################################### -qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt index 5b9c576d..ec8e81ce 100644 --- a/tests/auto/translation/CMakeLists.txt +++ b/tests/auto/translation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_translation +qt_internal_add_test(tst_translation SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,7 +37,7 @@ set(qmake_immediate_resource_files "qtbase_fr.qm" ) -qt_add_resource(tst_translation "qmake_immediate" +qt_internal_add_resource(tst_translation "qmake_immediate" PREFIX "/" FILES @@ -51,12 +51,12 @@ qt_add_resource(tst_translation "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_translation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_translation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt index 7979a42f..f3c5ad07 100644 --- a/tests/benchmarks/creationtime/CMakeLists.txt +++ b/tests/benchmarks/creationtime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_creationtime Test: ##################################################################### -qt_add_test(tst_creationtime +qt_internal_add_test(tst_creationtime SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_creationtime ## Scopes: ##################################################################### -qt_extend_target(tst_creationtime CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_creationtime CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt index 909fa988..932e18c6 100644 --- a/tests/benchmarks/objectcount/CMakeLists.txt +++ b/tests/benchmarks/objectcount/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_objectcount Test: ##################################################################### -qt_add_test(tst_objectcount +qt_internal_add_test(tst_objectcount SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_objectcount ## Scopes: ##################################################################### -qt_extend_target(tst_objectcount CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_objectcount CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -- cgit v1.2.3