diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 13:31:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:51 +0000 |
| commit | ba494aaa24defe1401f621b791891e696b308756 (patch) | |
| tree | 3617f29e9625fafbf94609ac79b2decd4033107c /tests/auto/quick | |
| parent | 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff) | |
Regenerate all projects with new CMake API version
Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/quick')
83 files changed, 222 insertions, 222 deletions
diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt index 168d2b918e..79600f8faf 100644 --- a/tests/auto/quick/drawingmodes/CMakeLists.txt +++ b/tests/auto/quick/drawingmodes/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_drawingmodes +qt_add_test(tst_drawingmodes SOURCES ../../shared/util.cpp ../../shared/util.h tst_drawingmodes.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_drawingmodes ## Scopes: ##################################################################### -extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index 339b72dbe3..ec5c67ad15 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_examples Test: ##################################################################### -add_qt_test(tst_examples +qt_add_test(tst_examples SOURCES tst_examples.cpp DEFINES diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt index c017ffc3d5..14678773b9 100644 --- a/tests/auto/quick/geometry/CMakeLists.txt +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_geometry Test: ##################################################################### -add_qt_test(tst_geometry +qt_add_test(tst_geometry SOURCES tst_geometry.cpp LIBRARIES diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt index a971539c63..f0b52003cf 100644 --- a/tests/auto/quick/nodes/CMakeLists.txt +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nodestest Test: ##################################################################### -add_qt_test(tst_nodestest +qt_add_test(tst_nodestest SOURCES tst_nodestest.cpp LIBRARIES diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt index 78e1604b12..1158d2cf4a 100644 --- a/tests/auto/quick/nokeywords/CMakeLists.txt +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nokeywords Test: ##################################################################### -add_qt_test(tst_nokeywords +qt_add_test(tst_nokeywords SOURCES tst_nokeywords.cpp LIBRARIES diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt index ef495e7844..3e2c17364a 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_flickableinterop +qt_add_test(tst_flickableinterop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_flickableinterop ## Scopes: ##################################################################### -extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt index a6ff5adab4..f9eda5cac2 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_multipointtoucharea_interop +qt_add_test(tst_multipointtoucharea_interop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_multipointtoucharea_interop ## Scopes: ##################################################################### -extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt index 2db5a70c03..114c4faa12 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickdraghandler +qt_add_test(tst_qquickdraghandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickdraghandler ## Scopes: ##################################################################### -extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt index b7e2983b73..90a3f848f2 100644 --- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickhoverhandler +qt_add_test(tst_qquickhoverhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickhoverhandler ## Scopes: ##################################################################### -extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt index edcc3cd7c3..f2eeab2ea9 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpinchhandler +qt_add_test(tst_qquickpinchhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickpinchhandler ## Scopes: ##################################################################### -extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt index d05c3067d3..b7d94b2e97 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpointerhandler +qt_add_test(tst_qquickpointerhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickpointerhandler ## Scopes: ##################################################################### -extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt index 5db27144bf..fc2fe64393 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpointhandler +qt_add_test(tst_qquickpointhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickpointhandler ## Scopes: ##################################################################### -extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt index c57a77725e..8e0353f717 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktaphandler +qt_add_test(tst_qquicktaphandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquicktaphandler ## Scopes: ##################################################################### -extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt index 222c985ce7..b8432c10b5 100644 --- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickwheelhandler +qt_add_test(tst_qquickwheelhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickwheelhandler ## Scopes: ##################################################################### -extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt index 6eacc6e68b..3c50490bd1 100644 --- a/tests/auto/quick/propertyrequirements/CMakeLists.txt +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_propertyrequirements Test: ##################################################################### -add_qt_test(tst_propertyrequirements +qt_add_test(tst_propertyrequirements SOURCES tst_propertyrequirements.cpp LIBRARIES diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt index b2379be093..215d31ca17 100644 --- a/tests/auto/quick/qquickaccessible/CMakeLists.txt +++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickaccessible +qt_add_test(tst_qquickaccessible SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickaccessible.cpp @@ -35,12 +35,12 @@ add_qt_test(tst_qquickaccessible ## Scopes: ##################################################################### -extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt index 35a72c411e..62a35d25c5 100644 --- a/tests/auto/quick/qquickanchors/CMakeLists.txt +++ b/tests/auto/quick/qquickanchors/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickanchors +qt_add_test(tst_qquickanchors SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickanchors ## Scopes: ##################################################################### -extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt index cb9c578b6a..7b2afa8cb7 100644 --- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickanimatedimage +qt_add_test(tst_qquickanimatedimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -33,12 +33,12 @@ add_qt_test(tst_qquickanimatedimage ## Scopes: ##################################################################### -extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt index fe7ad609e0..c79009e674 100644 --- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickanimatedsprite +qt_add_test(tst_qquickanimatedsprite SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimatedsprite.cpp @@ -36,12 +36,12 @@ add_qt_test(tst_qquickanimatedsprite ## Scopes: ##################################################################### -extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt index e0ac399cd4..e5822e77e3 100644 --- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt +++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickanimationcontroller +qt_add_test(tst_qquickanimationcontroller GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt index 6a2541a247..cdd599c8e0 100644 --- a/tests/auto/quick/qquickanimations/CMakeLists.txt +++ b/tests/auto/quick/qquickanimations/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickanimations +qt_add_test(tst_qquickanimations SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimations.cpp @@ -38,12 +38,12 @@ add_qt_test(tst_qquickanimations ## Scopes: ##################################################################### -extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt index 428073f0dc..969c1ef398 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickanimators Test: ##################################################################### -add_qt_test(tst_qquickanimators +qt_add_test(tst_qquickanimators SOURCES tst_qquickanimators.cpp LIBRARIES diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt index a7a2f4157d..e0c95a46b3 100644 --- a/tests/auto/quick/qquickapplication/CMakeLists.txt +++ b/tests/auto/quick/qquickapplication/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickapplication +qt_add_test(tst_qquickapplication SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickapplication.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_qquickapplication ## Scopes: ##################################################################### -extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt index 5894ac2774..a311447fb4 100644 --- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickbehaviors +qt_add_test(tst_qquickbehaviors SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickbehaviors.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_qquickbehaviors ## Scopes: ##################################################################### -extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt index 07fe7a1339..503f64fa01 100644 --- a/tests/auto/quick/qquickborderimage/CMakeLists.txt +++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickborderimage +qt_add_test(tst_qquickborderimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,12 +38,12 @@ add_qt_test(tst_qquickborderimage ## Scopes: ##################################################################### -extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt index 8d6c8910aa..c9605ad952 100644 --- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt +++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickboundaryrule +qt_add_test(tst_qquickboundaryrule SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickboundaryrule ## Scopes: ##################################################################### -extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt index b695355359..67e0f98564 100644 --- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt +++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickcanvasitem +qt_add_test(tst_qquickcanvasitem GUI QMLTEST SOURCES @@ -32,7 +32,7 @@ add_qt_test(tst_qquickcanvasitem ## Scopes: ##################################################################### -extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats +qt_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats DEFINES HAS_IMAGE_FORMATS ) diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt index 87492ff436..b7d26c43fb 100644 --- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt +++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickdesignersupport +qt_add_test(tst_qquickdesignersupport SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickdesignersupport ## Scopes: ##################################################################### -extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt index ad077411c2..cb4e82a73e 100644 --- a/tests/auto/quick/qquickdrag/CMakeLists.txt +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickdrag Test: ##################################################################### -add_qt_test(tst_qquickdrag +qt_add_test(tst_qquickdrag SOURCES tst_qquickdrag.cpp LIBRARIES diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index ea66f99c0c..85353502b1 100644 --- a/tests/auto/quick/qquickdroparea/CMakeLists.txt +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickdroparea +qt_add_test(tst_qquickdroparea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquickdroparea ## Scopes: ##################################################################### -extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt index f56593b245..82638f0624 100644 --- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickdynamicpropertyanimation +qt_add_test(tst_qquickdynamicpropertyanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickdynamicpropertyanimation.cpp @@ -26,12 +26,12 @@ add_qt_test(tst_qquickdynamicpropertyanimation ## Scopes: ##################################################################### -extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt index 43ec4cd14d..1284e574c9 100644 --- a/tests/auto/quick/qquickflickable/CMakeLists.txt +++ b/tests/auto/quick/qquickflickable/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickflickable +qt_add_test(tst_qquickflickable SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickflickable ## Scopes: ##################################################################### -extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt index 42d3e5516e..99489be92f 100644 --- a/tests/auto/quick/qquickflipable/CMakeLists.txt +++ b/tests/auto/quick/qquickflipable/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickflipable +qt_add_test(tst_qquickflipable SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickflipable.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquickflipable ## Scopes: ##################################################################### -extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt index 3d13e0b9e0..ae829dd9e0 100644 --- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt +++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickfocusscope +qt_add_test(tst_qquickfocusscope SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickfocusscope ## Scopes: ##################################################################### -extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt index 44dcfdad0a..50a9a3488b 100644 --- a/tests/auto/quick/qquickfontloader/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickfontloader +qt_add_test(tst_qquickfontloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -33,12 +33,12 @@ add_qt_test(tst_qquickfontloader ## Scopes: ##################################################################### -extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt index 0ddf042334..f0b157b517 100644 --- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickfontloader_static +qt_add_test(tst_qquickfontloader_static SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfontloader_static.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_qquickfontloader_static ## Scopes: ##################################################################### -extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt index 6cab5d6550..3f79973de5 100644 --- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quickfontmetrics Test: ##################################################################### -add_qt_test(tst_quickfontmetrics +qt_add_test(tst_quickfontmetrics SOURCES tst_quickfontmetrics.cpp LIBRARIES diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt index d58a100884..0f04723557 100644 --- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt +++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickframebufferobject +qt_add_test(tst_qquickframebufferobject SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickframebufferobject.cpp @@ -28,12 +28,12 @@ add_qt_test(tst_qquickframebufferobject ## Scopes: ##################################################################### -extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt index 6de5162b10..0393d805e6 100644 --- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt +++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickgraphicsinfo +qt_add_test(tst_qquickgraphicsinfo SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgraphicsinfo.cpp @@ -28,12 +28,12 @@ add_qt_test(tst_qquickgraphicsinfo ## Scopes: ##################################################################### -extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt index 885ef9eae4..8880b57d24 100644 --- a/tests/auto/quick/qquickgridview/CMakeLists.txt +++ b/tests/auto/quick/qquickgridview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickgridview +qt_add_test(tst_qquickgridview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -42,12 +42,12 @@ add_qt_test(tst_qquickgridview ## Scopes: ##################################################################### -extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt index 9c519290ce..e18d4d47fb 100644 --- a/tests/auto/quick/qquickimage/CMakeLists.txt +++ b/tests/auto/quick/qquickimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickimage +qt_add_test(tst_qquickimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,12 +38,12 @@ add_qt_test(tst_qquickimage ## Scopes: ##################################################################### -extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt index d81a845a02..80826d35fc 100644 --- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickimageprovider Test: ##################################################################### -add_qt_test(tst_qquickimageprovider +qt_add_test(tst_qquickimageprovider SOURCES tst_qquickimageprovider.cpp LIBRARIES diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt index e78d7d7b40..af18dca7a2 100644 --- a/tests/auto/quick/qquickitem/CMakeLists.txt +++ b/tests/auto/quick/qquickitem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickitem +qt_add_test(tst_qquickitem SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,19 +36,19 @@ add_qt_test(tst_qquickitem ## Scopes: ##################################################################### -extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets DEFINES TEST_QTBUG_60123 PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qquickitem CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickitem CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt index 1555ad6cef..ea6040831e 100644 --- a/tests/auto/quick/qquickitem2/CMakeLists.txt +++ b/tests/auto/quick/qquickitem2/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickitem2 +qt_add_test(tst_qquickitem2 SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitem.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquickitem2 ## Scopes: ##################################################################### -extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt index a03a0d3478..bc145ae48b 100644 --- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt +++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickitemlayer +qt_add_test(tst_qquickitemlayer SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemlayer.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_qquickitemlayer ## Scopes: ##################################################################### -extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt index 1c515786a2..c3960001c0 100644 --- a/tests/auto/quick/qquicklayouts/CMakeLists.txt +++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicklayouts +qt_add_test(tst_qquicklayouts GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index 7c809d8c29..c2083c4876 100644 --- a/tests/auto/quick/qquicklistview/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicklistview +qt_add_test(tst_qquicklistview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -46,12 +46,12 @@ add_qt_test(tst_qquicklistview ## Scopes: ##################################################################### -extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt index a92ea61df5..a373976d6d 100644 --- a/tests/auto/quick/qquickloader/CMakeLists.txt +++ b/tests/auto/quick/qquickloader/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickloader +qt_add_test(tst_qquickloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,12 +38,12 @@ add_qt_test(tst_qquickloader ## Scopes: ##################################################################### -extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt index bb60a32d8b..79d749cae4 100644 --- a/tests/auto/quick/qquickmousearea/CMakeLists.txt +++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmousearea +qt_add_test(tst_qquickmousearea SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -41,12 +41,12 @@ add_qt_test(tst_qquickmousearea ## Scopes: ##################################################################### -extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt index bb3ae58ab3..97861b99f5 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt +++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmultipointtoucharea +qt_add_test(tst_qquickmultipointtoucharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickmultipointtoucharea ## Scopes: ##################################################################### -extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt index bf366c2b7c..c0bc92c73f 100644 --- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt +++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickopenglinfo +qt_add_test(tst_qquickopenglinfo SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickopenglinfo.cpp @@ -28,12 +28,12 @@ add_qt_test(tst_qquickopenglinfo ## Scopes: ##################################################################### -extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt index fd528006b0..ed5ce75b31 100644 --- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickpainteditem Test: ##################################################################### -add_qt_test(tst_qquickpainteditem +qt_add_test(tst_qquickpainteditem SOURCES tst_qquickpainteditem.cpp LIBRARIES diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt index cf7d7740ac..98e24e9864 100644 --- a/tests/auto/quick/qquickpath/CMakeLists.txt +++ b/tests/auto/quick/qquickpath/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpath +qt_add_test(tst_qquickpath SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpath.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_qquickpath ## Scopes: ##################################################################### -extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt index a9b2bfb1af..8f9622963f 100644 --- a/tests/auto/quick/qquickpathview/CMakeLists.txt +++ b/tests/auto/quick/qquickpathview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpathview +qt_add_test(tst_qquickpathview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,17 +39,17 @@ add_qt_test(tst_qquickpathview ## Scopes: ##################################################################### -extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qquickpathview CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpathview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt index 07a3768684..3d78622048 100644 --- a/tests/auto/quick/qquickpincharea/CMakeLists.txt +++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpincharea +qt_add_test(tst_qquickpincharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickpincharea ## Scopes: ##################################################################### -extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt index 7064dc9ce5..7cecf3e8db 100644 --- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt +++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpixmapcache +qt_add_test(tst_qquickpixmapcache SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -34,12 +34,12 @@ add_qt_test(tst_qquickpixmapcache ## Scopes: ##################################################################### -extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt index 3a5aa6aa5f..47093891da 100644 --- a/tests/auto/quick/qquickpositioners/CMakeLists.txt +++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickpositioners +qt_add_test(tst_qquickpositioners SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,12 +37,12 @@ add_qt_test(tst_qquickpositioners ## Scopes: ##################################################################### -extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt index 5653c08dd3..2ea94e17ba 100644 --- a/tests/auto/quick/qquickrectangle/CMakeLists.txt +++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickrectangle +qt_add_test(tst_qquickrectangle SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickrectangle ## Scopes: ##################################################################### -extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt index 5863de83ef..75bec8fa5d 100644 --- a/tests/auto/quick/qquickrepeater/CMakeLists.txt +++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickrepeater +qt_add_test(tst_qquickrepeater SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,12 +38,12 @@ add_qt_test(tst_qquickrepeater ## Scopes: ##################################################################### -extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt index c53ed38d28..7b04bb863e 100644 --- a/tests/auto/quick/qquickscreen/CMakeLists.txt +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickscreen Test: ##################################################################### -add_qt_test(tst_qquickscreen +qt_add_test(tst_qquickscreen SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickscreen.cpp @@ -24,12 +24,12 @@ add_qt_test(tst_qquickscreen ## Scopes: ##################################################################### -extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt index 11b63af453..c4a3b39cdb 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickshadereffect Test: ##################################################################### -add_qt_test(tst_qquickshadereffect +qt_add_test(tst_qquickshadereffect SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshadereffect.cpp @@ -24,12 +24,12 @@ add_qt_test(tst_qquickshadereffect ## Scopes: ##################################################################### -extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt index 4e31680f7f..409789903b 100644 --- a/tests/auto/quick/qquickshape/CMakeLists.txt +++ b/tests/auto/quick/qquickshape/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickshape +qt_add_test(tst_qquickshape SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -41,17 +41,17 @@ add_qt_test(tst_qquickshape ## Scopes: ##################################################################### -extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qquickshape CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickshape CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt index 42b69b9587..8bad39e70c 100644 --- a/tests/auto/quick/qquickshortcut/CMakeLists.txt +++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickshortcut +qt_add_test(tst_qquickshortcut SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshortcut.cpp @@ -26,17 +26,17 @@ add_qt_test(tst_qquickshortcut ## Scopes: ##################################################################### -extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::QuickWidgets ) -extend_target(tst_qquickshortcut CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt index 837160e69b..8e7d6d538b 100644 --- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt +++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicksmoothedanimation +qt_add_test(tst_qquicksmoothedanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicksmoothedanimation.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquicksmoothedanimation ## Scopes: ##################################################################### -extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt index 85b53abf9a..3cb4b781d5 100644 --- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickspringanimation +qt_add_test(tst_qquickspringanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspringanimation.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquickspringanimation ## Scopes: ##################################################################### -extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt index f40680742a..0fcb643b45 100644 --- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt +++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickspritesequence +qt_add_test(tst_qquickspritesequence SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritesequence.cpp @@ -32,12 +32,12 @@ add_qt_test(tst_qquickspritesequence ## Scopes: ##################################################################### -extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt index 7494cfb97f..d33ea3a444 100644 --- a/tests/auto/quick/qquickstates/CMakeLists.txt +++ b/tests/auto/quick/qquickstates/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickstates +qt_add_test(tst_qquickstates SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickstates.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquickstates ## Scopes: ##################################################################### -extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt index 0d0808969a..e8158b803a 100644 --- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickstyledtext Test: ##################################################################### -add_qt_test(tst_qquickstyledtext +qt_add_test(tst_qquickstyledtext SOURCES tst_qquickstyledtext.cpp LIBRARIES diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt index 53287a6d0c..b3033929b7 100644 --- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicksystempalette Test: ##################################################################### -add_qt_test(tst_qquicksystempalette +qt_add_test(tst_qquicksystempalette SOURCES tst_qquicksystempalette.cpp LIBRARIES @@ -21,7 +21,7 @@ add_qt_test(tst_qquicksystempalette ## Scopes: ##################################################################### -extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt index 773a166473..d77b99869a 100644 --- a/tests/auto/quick/qquicktableview/CMakeLists.txt +++ b/tests/auto/quick/qquicktableview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktableview +qt_add_test(tst_qquicktableview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -40,12 +40,12 @@ add_qt_test(tst_qquicktableview ## Scopes: ##################################################################### -extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt index 7148567a25..60068d5c3e 100644 --- a/tests/auto/quick/qquicktext/CMakeLists.txt +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktext +qt_add_test(tst_qquicktext SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -34,12 +34,12 @@ add_qt_test(tst_qquicktext ## Scopes: ##################################################################### -extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt index 5b23371191..116ac8af22 100644 --- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt +++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktextdocument +qt_add_test(tst_qquicktextdocument SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktextdocument.cpp @@ -31,12 +31,12 @@ add_qt_test(tst_qquicktextdocument ## Scopes: ##################################################################### -extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt index cc244983b0..8ce170eec4 100644 --- a/tests/auto/quick/qquicktextedit/CMakeLists.txt +++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktextedit +qt_add_test(tst_qquicktextedit SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -39,17 +39,17 @@ add_qt_test(tst_qquicktextedit ## Scopes: ##################################################################### -extend_target(tst_qquicktextedit CONDITION APPLE_OSX +qt_extend_target(tst_qquicktextedit CONDITION APPLE_OSX PUBLIC_LIBRARIES ${FWAppKit} ) -extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt index 0901c29b21..a67c7dc226 100644 --- a/tests/auto/quick/qquicktextinput/CMakeLists.txt +++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquicktextinput +qt_add_test(tst_qquicktextinput SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -32,17 +32,17 @@ add_qt_test(tst_qquicktextinput ## Scopes: ##################################################################### -extend_target(tst_qquicktextinput CONDITION APPLE_OSX +qt_extend_target(tst_qquicktextinput CONDITION APPLE_OSX PUBLIC_LIBRARIES ${FWAppKit} ) -extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt index 0fbb74e0a8..8f5001e46c 100644 --- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktextmetrics Test: ##################################################################### -add_qt_test(tst_qquicktextmetrics +qt_add_test(tst_qquicktextmetrics SOURCES tst_qquicktextmetrics.cpp LIBRARIES diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt index 40e926dd0d..3b282ce0af 100644 --- a/tests/auto/quick/qquicktimeline/CMakeLists.txt +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktimeline Test: ##################################################################### -add_qt_test(tst_qquicktimeline +qt_add_test(tst_qquicktimeline SOURCES tst_qquicktimeline.cpp LIBRARIES diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt index c7cf57a66a..9216d18ec7 100644 --- a/tests/auto/quick/qquickview/CMakeLists.txt +++ b/tests/auto/quick/qquickview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickview +qt_add_test(tst_qquickview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_qquickview ## Scopes: ##################################################################### -extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt index f9d4d96473..20aa59cb9f 100644 --- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt +++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickvisualdatamodel +qt_add_test(tst_qquickvisualdatamodel SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,17 +38,17 @@ add_qt_test(tst_qquickvisualdatamodel ## Scopes: ##################################################################### -extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt index 8d119952f7..338b6edbbc 100644 --- a/tests/auto/quick/qquickwindow/CMakeLists.txt +++ b/tests/auto/quick/qquickwindow/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickwindow +qt_add_test(tst_qquickwindow SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,12 +39,12 @@ add_qt_test(tst_qquickwindow ## Scopes: ##################################################################### -extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt index 7116c65a6c..2686873672 100644 --- a/tests/auto/quick/rendernode/CMakeLists.txt +++ b/tests/auto/quick/rendernode/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_rendernode +qt_add_test(tst_rendernode SOURCES ../../shared/util.cpp ../../shared/util.h tst_rendernode.cpp @@ -34,12 +34,12 @@ add_qt_test(tst_rendernode ## Scopes: ##################################################################### -extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt index e36a2b6720..888311d698 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scenegraph Test: ##################################################################### -add_qt_test(tst_scenegraph +qt_add_test(tst_scenegraph SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -32,12 +32,12 @@ add_qt_test(tst_scenegraph ## Scopes: ##################################################################### -extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt index 41ab25187d..f8c4c707bd 100644 --- a/tests/auto/quick/sharedimage/CMakeLists.txt +++ b/tests/auto/quick/sharedimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_sharedimage +qt_add_test(tst_sharedimage SOURCES tst_sharedimage.cpp LIBRARIES diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt index 5b1c02b0e5..f8c1e2f186 100644 --- a/tests/auto/quick/touchmouse/CMakeLists.txt +++ b/tests/auto/quick/touchmouse/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_touchmouse +qt_add_test(tst_touchmouse SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ add_qt_test(tst_touchmouse ## Scopes: ##################################################################### -extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |