From 08adbefa131ef1c934f55cd61716c8ea836ddf02 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 15:23:08 +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: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam --- tests/auto/particles/qquickage/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickangleddirection/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickcumulativedirection/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickcustomaffector/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickellipseextruder/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickfriction/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickgravity/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickgroupgoal/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickimageparticle/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickitemparticle/CMakeLists.txt | 6 +++--- tests/auto/particles/qquicklineextruder/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickmaskextruder/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickparticlegroup/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickparticlesystem/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickpointattractor/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickpointdirection/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickrectangleextruder/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickspritegoal/CMakeLists.txt | 6 +++--- tests/auto/particles/qquicktargetdirection/CMakeLists.txt | 6 +++--- tests/auto/particles/qquicktrailemitter/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickturbulence/CMakeLists.txt | 6 +++--- tests/auto/particles/qquickwander/CMakeLists.txt | 6 +++--- 22 files changed, 66 insertions(+), 66 deletions(-) (limited to 'tests/auto/particles') diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt index ef76c37e1e..ef1cb8fe45 100644 --- a/tests/auto/particles/qquickage/CMakeLists.txt +++ b/tests/auto/particles/qquickage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickage +qt_internal_add_test(tst_qquickage SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickage.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt index 7d8d98c948..a60dfa8d6b 100644 --- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt +++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickangleddirection +qt_internal_add_test(tst_qquickangleddirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickangleddirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickangleddirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickangleddirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickangleddirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt index 49e4eabcbc..0eecede9a5 100644 --- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt +++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcumulativedirection +qt_internal_add_test(tst_qquickcumulativedirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcumulativedirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickcumulativedirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt index bf65a1056f..7b09402ea4 100644 --- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcustomaffector +qt_internal_add_test(tst_qquickcustomaffector SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcustomaffector.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickcustomaffector ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt index 6b56fe027a..4d432f78d0 100644 --- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickellipseextruder +qt_internal_add_test(tst_qquickellipseextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickellipseextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickellipseextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt index b72caa7e24..5e7e270d69 100644 --- a/tests/auto/particles/qquickfriction/CMakeLists.txt +++ b/tests/auto/particles/qquickfriction/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfriction +qt_internal_add_test(tst_qquickfriction SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfriction.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickfriction ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfriction CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfriction CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt index 3c5c294a95..e555dd9f80 100644 --- a/tests/auto/particles/qquickgravity/CMakeLists.txt +++ b/tests/auto/particles/qquickgravity/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgravity +qt_internal_add_test(tst_qquickgravity SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgravity.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickgravity ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgravity CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgravity CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt index 6c8ed8d0d4..dbacb28d29 100644 --- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt +++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgroupgoal +qt_internal_add_test(tst_qquickgroupgoal SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgroupgoal.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickgroupgoal ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt index 819ea52b6e..03f6ea0ef8 100644 --- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickimageparticle +qt_internal_add_test(tst_qquickimageparticle SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickimageparticle.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickimageparticle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickimageparticle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickimageparticle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt index e13dfc8b3f..ff695eb8af 100644 --- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickitemparticle +qt_internal_add_test(tst_qquickitemparticle SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemparticle.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickitemparticle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitemparticle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitemparticle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt index b6dc214949..d7791103be 100644 --- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt +++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicklineextruder +qt_internal_add_test(tst_qquicklineextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicklineextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicklineextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquicklineextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicklineextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt index f85092317e..0ea7f18f6d 100644 --- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaskextruder +qt_internal_add_test(tst_qquickmaskextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickmaskextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickmaskextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt index ca5664bc4c..4d335b18d0 100644 --- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickparticlegroup +qt_internal_add_test(tst_qquickparticlegroup SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlegroup.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlegroup ## Scopes: ##################################################################### -qt_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt index 20dd7d4ec8..984a7350f0 100644 --- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickparticlesystem +qt_internal_add_test(tst_qquickparticlesystem SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlesystem.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlesystem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt index 6f01e7df7e..6dfdc085af 100644 --- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt +++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointattractor +qt_internal_add_test(tst_qquickpointattractor SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointattractor.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointattractor ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointattractor CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointattractor CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt index ee66e0af9f..73867c74bb 100644 --- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt +++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointdirection +qt_internal_add_test(tst_qquickpointdirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointdirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointdirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointdirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointdirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt index 991fa0069a..9e48fd6d93 100644 --- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickrectangleextruder +qt_internal_add_test(tst_qquickrectangleextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickrectangleextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickrectangleextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt index 9e7ee863c9..0f87615bb0 100644 --- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt +++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickspritegoal +qt_internal_add_test(tst_qquickspritegoal SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritegoal.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritegoal ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspritegoal CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspritegoal CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt index d7cdb68677..1bb462af66 100644 --- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt +++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktargetdirection +qt_internal_add_test(tst_qquicktargetdirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktargetdirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicktargetdirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt index b4852f40eb..e7eb6ab607 100644 --- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt +++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktrailemitter +qt_internal_add_test(tst_qquicktrailemitter SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktrailemitter.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicktrailemitter ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt index c5ae3db05c..166649214c 100644 --- a/tests/auto/particles/qquickturbulence/CMakeLists.txt +++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickturbulence +qt_internal_add_test(tst_qquickturbulence SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickturbulence.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickturbulence ## Scopes: ##################################################################### -qt_extend_target(tst_qquickturbulence CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickturbulence CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt index b6e2f95bc6..8ce66a2318 100644 --- a/tests/auto/particles/qquickwander/CMakeLists.txt +++ b/tests/auto/particles/qquickwander/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickwander +qt_internal_add_test(tst_qquickwander SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickwander.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickwander ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwander CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwander CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -- cgit v1.2.3