diff options
Diffstat (limited to 'tests/auto/quick')
86 files changed, 229 insertions, 229 deletions
diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt index e225df5424..f7bf15f49f 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}) -qt_add_test(tst_drawingmodes +qt_internal_add_test(tst_drawingmodes SOURCES ../../shared/util.cpp ../../shared/util.h tst_drawingmodes.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_drawingmodes ## Scopes: ##################################################################### -qt_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT 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 74efa0ad40..5bcaa3f93a 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_examples Test: ##################################################################### -qt_add_test(tst_examples +qt_internal_add_test(tst_examples SOURCES tst_examples.cpp DEFINES diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt index 5a791a8a9e..1c729527fe 100644 --- a/tests/auto/quick/geometry/CMakeLists.txt +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_geometry Test: ##################################################################### -qt_add_test(tst_geometry +qt_internal_add_test(tst_geometry SOURCES tst_geometry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt index 825442479f..9b85a9fb7b 100644 --- a/tests/auto/quick/nodes/CMakeLists.txt +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nodestest Test: ##################################################################### -qt_add_test(tst_nodestest +qt_internal_add_test(tst_nodestest SOURCES tst_nodestest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt index bdf29817c0..682ab8aa9c 100644 --- a/tests/auto/quick/nokeywords/CMakeLists.txt +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nokeywords Test: ##################################################################### -qt_add_test(tst_nokeywords +qt_internal_add_test(tst_nokeywords SOURCES tst_nokeywords.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ qt_add_test(tst_nokeywords ## Scopes: ##################################################################### -qt_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate ) diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt index 0d6cc7b58b..f67f9a0a59 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}) -qt_add_test(tst_flickableinterop +qt_internal_add_test(tst_flickableinterop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_flickableinterop ## Scopes: ##################################################################### -qt_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt index 5783c2dc60..f799de97b8 100644 --- a/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_mousearea_interop +qt_internal_add_test(tst_mousearea_interop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_mousearea_interop ## Scopes: ##################################################################### -qt_extend_target(tst_mousearea_interop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_mousearea_interop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_mousearea_interop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_mousearea_interop CONDITION NOT ANDROID AND NOT 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 8868ccdbbc..4aac9440f9 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}) -qt_add_test(tst_multipointtoucharea_interop +qt_internal_add_test(tst_multipointtoucharea_interop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_multipointtoucharea_interop ## Scopes: ##################################################################### -qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT 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 825260f53d..85c664f8ca 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}) -qt_add_test(tst_qquickdraghandler +qt_internal_add_test(tst_qquickdraghandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickdraghandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT 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 7ff86c7c6e..654bf1c366 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}) -qt_add_test(tst_qquickhoverhandler +qt_internal_add_test(tst_qquickhoverhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickhoverhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT 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 110948c4ee..09550b143d 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}) -qt_add_test(tst_qquickpinchhandler +qt_internal_add_test(tst_qquickpinchhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickpinchhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT 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 7da285b4ce..9dc541a845 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}) -qt_add_test(tst_qquickpointerhandler +qt_internal_add_test(tst_qquickpointerhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickpointerhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT 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 51312f1db3..507bc7549b 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}) -qt_add_test(tst_qquickpointhandler +qt_internal_add_test(tst_qquickpointhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickpointhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT 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 97c8106931..babe276519 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}) -qt_add_test(tst_qquicktaphandler +qt_internal_add_test(tst_qquicktaphandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquicktaphandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT 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 32d7ce9398..588fd8f2e2 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}) -qt_add_test(tst_qquickwheelhandler +qt_internal_add_test(tst_qquickwheelhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickwheelhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT 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 2a37646920..6b689502ea 100644 --- a/tests/auto/quick/propertyrequirements/CMakeLists.txt +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_propertyrequirements Test: ##################################################################### -qt_add_test(tst_propertyrequirements +qt_internal_add_test(tst_propertyrequirements SOURCES tst_propertyrequirements.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt index e6a34e0d3f..8d0fcbe406 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}) -qt_add_test(tst_qquickaccessible +qt_internal_add_test(tst_qquickaccessible SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickaccessible.cpp @@ -32,12 +32,12 @@ qt_add_test(tst_qquickaccessible ## Scopes: ##################################################################### -qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT 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 04065b9057..08a4298145 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}) -qt_add_test(tst_qquickanchors +qt_internal_add_test(tst_qquickanchors SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickanchors ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT 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 ea18c9b5a5..e7a026a36f 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}) -qt_add_test(tst_qquickanimatedimage +qt_internal_add_test(tst_qquickanimatedimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -30,12 +30,12 @@ qt_add_test(tst_qquickanimatedimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT 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 3165a91673..9e20d712e6 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}) -qt_add_test(tst_qquickanimatedsprite +qt_internal_add_test(tst_qquickanimatedsprite SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimatedsprite.cpp @@ -33,12 +33,12 @@ qt_add_test(tst_qquickanimatedsprite ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT 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 f958f9272e..ffe59c805e 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}) -qt_add_test(tst_qquickanimationcontroller +qt_internal_add_test(tst_qquickanimationcontroller GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt index 822650e91e..63a1236eb9 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}) -qt_add_test(tst_qquickanimations +qt_internal_add_test(tst_qquickanimations SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimations.cpp @@ -34,12 +34,12 @@ qt_add_test(tst_qquickanimations ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT 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 e0a9fa9029..db1c18e03c 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickanimators Test: ##################################################################### -qt_add_test(tst_qquickanimators +qt_internal_add_test(tst_qquickanimators SOURCES tst_qquickanimators.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt index b26bb64b09..53582b4548 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}) -qt_add_test(tst_qquickapplication +qt_internal_add_test(tst_qquickapplication SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickapplication.cpp @@ -33,12 +33,12 @@ qt_add_test(tst_qquickapplication ## Scopes: ##################################################################### -qt_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT 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 f305fb030f..330df778b6 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}) -qt_add_test(tst_qquickbehaviors +qt_internal_add_test(tst_qquickbehaviors SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickbehaviors.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickbehaviors ## Scopes: ##################################################################### -qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT 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 9bcb99befa..7316588123 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}) -qt_add_test(tst_qquickborderimage +qt_internal_add_test(tst_qquickborderimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickborderimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT 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 5fc6d1c2f0..96395c9956 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}) -qt_add_test(tst_qquickboundaryrule +qt_internal_add_test(tst_qquickboundaryrule SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickboundaryrule ## Scopes: ##################################################################### -qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT 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 0c935891b4..bd9b7a7265 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}) -qt_add_test(tst_qquickcanvasitem +qt_internal_add_test(tst_qquickcanvasitem GUI QMLTEST SOURCES @@ -30,7 +30,7 @@ qt_add_test(tst_qquickcanvasitem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats +qt_internal_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats DEFINES HAS_IMAGE_FORMATS ) diff --git a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt index c873b87934..9fde27b06f 100644 --- a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt +++ b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickcolorgroup Test: ##################################################################### -qt_add_test(tst_qquickcolorgroup +qt_internal_add_test(tst_qquickcolorgroup SOURCES tst_qquickcolorgroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt index 4ce3896d23..88c050f55c 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}) -qt_add_test(tst_qquickdesignersupport +qt_internal_add_test(tst_qquickdesignersupport SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickdesignersupport ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT 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 046072e769..16da0943e9 100644 --- a/tests/auto/quick/qquickdrag/CMakeLists.txt +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickdrag Test: ##################################################################### -qt_add_test(tst_qquickdrag +qt_internal_add_test(tst_qquickdrag SOURCES tst_qquickdrag.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index 2e64905df5..d66bf23714 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}) -qt_add_test(tst_qquickdroparea +qt_internal_add_test(tst_qquickdroparea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickdroparea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT 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 e843088036..78395e4661 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}) -qt_add_test(tst_qquickdynamicpropertyanimation +qt_internal_add_test(tst_qquickdynamicpropertyanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickdynamicpropertyanimation.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qquickdynamicpropertyanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT 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 579f5bcfd7..7c8e802daf 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}) -qt_add_test(tst_qquickflickable +qt_internal_add_test(tst_qquickflickable SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickflickable ## Scopes: ##################################################################### -qt_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT 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 e30d57a4ba..95231d7ad9 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}) -qt_add_test(tst_qquickflipable +qt_internal_add_test(tst_qquickflipable SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickflipable.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickflipable ## Scopes: ##################################################################### -qt_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT 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 f106e8bde2..dac0f78281 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}) -qt_add_test(tst_qquickfocusscope +qt_internal_add_test(tst_qquickfocusscope SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickfocusscope ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT 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 d244c0a2e7..bfaa048bca 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}) -qt_add_test(tst_qquickfontloader +qt_internal_add_test(tst_qquickfontloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -30,12 +30,12 @@ qt_add_test(tst_qquickfontloader ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT 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 ce25511fca..efdf13c95d 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}) -qt_add_test(tst_qquickfontloader_static +qt_internal_add_test(tst_qquickfontloader_static SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfontloader_static.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickfontloader_static ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT 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 7509c6dd86..785248fb99 100644 --- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quickfontmetrics Test: ##################################################################### -qt_add_test(tst_quickfontmetrics +qt_internal_add_test(tst_quickfontmetrics SOURCES tst_quickfontmetrics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt index ba720e1d26..9f242842e6 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}) -qt_add_test(tst_qquickframebufferobject +qt_internal_add_test(tst_qquickframebufferobject SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickframebufferobject.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickframebufferobject ## Scopes: ##################################################################### -qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT 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 a85a526ca4..5a45d8aabd 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}) -qt_add_test(tst_qquickgraphicsinfo +qt_internal_add_test(tst_qquickgraphicsinfo SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgraphicsinfo.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickgraphicsinfo ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT 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 de7cfe581c..07dd48c0a8 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}) -qt_add_test(tst_qquickgridview +qt_internal_add_test(tst_qquickgridview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickgridview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT 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 4aeed8b2f2..b7e5479639 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}) -qt_add_test(tst_qquickimage +qt_internal_add_test(tst_qquickimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT 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 7771df4237..a336e28048 100644 --- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickimageprovider Test: ##################################################################### -qt_add_test(tst_qquickimageprovider +qt_internal_add_test(tst_qquickimageprovider SOURCES tst_qquickimageprovider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt index 00882afa3a..cbc91f8f50 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}) -qt_add_test(tst_qquickitem +qt_internal_add_test(tst_qquickitem SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,19 +33,19 @@ qt_add_test(tst_qquickitem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets DEFINES TEST_QTBUG_60123 PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickitem CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitem CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT 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 5d8bb99dee..f60d1b2d55 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}) -qt_add_test(tst_qquickitem2 +qt_internal_add_test(tst_qquickitem2 SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitem.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickitem2 ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT 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 d81ae9ecc2..37103b0c31 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}) -qt_add_test(tst_qquickitemlayer +qt_internal_add_test(tst_qquickitemlayer SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemlayer.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickitemlayer ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT 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 f750a4f1c5..520d247394 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}) -qt_add_test(tst_qquicklayouts +qt_internal_add_test(tst_qquicklayouts GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index 9244fb6cee..761d515eaf 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}) -qt_add_test(tst_qquicklistview +qt_internal_add_test(tst_qquicklistview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -43,12 +43,12 @@ qt_add_test(tst_qquicklistview ## Scopes: ##################################################################### -qt_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT 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 114598bd3f..785d5348a6 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}) -qt_add_test(tst_qquickloader +qt_internal_add_test(tst_qquickloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickloader ## Scopes: ##################################################################### -qt_extend_target(tst_qquickloader CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickloader CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT 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 969bb745f3..7061c92384 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}) -qt_add_test(tst_qquickmousearea +qt_internal_add_test(tst_qquickmousearea SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickmousearea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT 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 dff7c77ceb..1902b3fefa 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}) -qt_add_test(tst_qquickmultipointtoucharea +qt_internal_add_test(tst_qquickmultipointtoucharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickmultipointtoucharea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT 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 c07fff8ef1..9649ffc032 100644 --- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickpainteditem Test: ##################################################################### -qt_add_test(tst_qquickpainteditem +qt_internal_add_test(tst_qquickpainteditem SOURCES tst_qquickpainteditem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickpalette/CMakeLists.txt b/tests/auto/quick/qquickpalette/CMakeLists.txt index 70bf19305c..a68873d5dc 100644 --- a/tests/auto/quick/qquickpalette/CMakeLists.txt +++ b/tests/auto/quick/qquickpalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickpalette Test: ##################################################################### -qt_add_test(tst_qquickpalette +qt_internal_add_test(tst_qquickpalette SOURCES tst_qquickpalette.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt index fa41ef74e1..c616519987 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}) -qt_add_test(tst_qquickpath +qt_internal_add_test(tst_qquickpath SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpath.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickpath ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpath CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpath CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT 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 c3df8ff6a6..2f3bd53500 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}) -qt_add_test(tst_qquickpathview +qt_internal_add_test(tst_qquickpathview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -35,17 +35,17 @@ qt_add_test(tst_qquickpathview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT 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 d9394bad9e..4f417366a1 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}) -qt_add_test(tst_qquickpincharea +qt_internal_add_test(tst_qquickpincharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickpincharea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT 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 cb2debfe6d..e50a6eb6a8 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}) -qt_add_test(tst_qquickpixmapcache +qt_internal_add_test(tst_qquickpixmapcache SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_qquickpixmapcache ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT 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 040f045598..e72958c6cd 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}) -qt_add_test(tst_qquickpositioners +qt_internal_add_test(tst_qquickpositioners SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickpositioners ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT 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 4a563432b6..5ccb12a3f7 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}) -qt_add_test(tst_qquickrectangle +qt_internal_add_test(tst_qquickrectangle SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickrectangle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt index df20449a90..46cfc1513c 100644 --- a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt +++ b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickrendercontrol Test: ##################################################################### -qt_add_test(tst_qquickrendercontrol +qt_internal_add_test(tst_qquickrendercontrol SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickrendercontrol.cpp @@ -24,12 +24,12 @@ qt_add_test(tst_qquickrendercontrol ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrendercontrol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrendercontrol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrendercontrol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrendercontrol CONDITION NOT ANDROID AND NOT 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 950608e0b7..3e7fda53c0 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}) -qt_add_test(tst_qquickrepeater +qt_internal_add_test(tst_qquickrepeater SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickrepeater ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT 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 4838fd8321..65c5538be3 100644 --- a/tests/auto/quick/qquickscreen/CMakeLists.txt +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickscreen Test: ##################################################################### -qt_add_test(tst_qquickscreen +qt_internal_add_test(tst_qquickscreen SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickscreen.cpp @@ -21,12 +21,12 @@ qt_add_test(tst_qquickscreen ## Scopes: ##################################################################### -qt_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT 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 5d36b7cba2..92a1baa227 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickshadereffect Test: ##################################################################### -qt_add_test(tst_qquickshadereffect +qt_internal_add_test(tst_qquickshadereffect SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshadereffect.cpp @@ -34,7 +34,7 @@ set(resources_resource_files "data/twoImagesOneShaderEffect.qml" ) -qt_add_resource(tst_qquickshadereffect "resources" +qt_internal_add_resource(tst_qquickshadereffect "resources" PREFIX "/" FILES @@ -45,12 +45,12 @@ qt_add_resource(tst_qquickshadereffect "resources" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT 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 96e48c29e5..325d812ed2 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}) -qt_add_test(tst_qquickshape +qt_internal_add_test(tst_qquickshape SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,17 +37,17 @@ qt_add_test(tst_qquickshape ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickshape CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshape CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT 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 c3986d263d..dda488abff 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}) -qt_add_test(tst_qquickshortcut +qt_internal_add_test(tst_qquickshortcut SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshortcut.cpp @@ -26,17 +26,17 @@ qt_add_test(tst_qquickshortcut ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::QuickWidgets ) -qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT 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 31841f2740..f487e786ab 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}) -qt_add_test(tst_qquicksmoothedanimation +qt_internal_add_test(tst_qquicksmoothedanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicksmoothedanimation.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquicksmoothedanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT 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 4831c67c10..b90f76cdf6 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}) -qt_add_test(tst_qquickspringanimation +qt_internal_add_test(tst_qquickspringanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspringanimation.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickspringanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT 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 6887b1ee79..3955536260 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}) -qt_add_test(tst_qquickspritesequence +qt_internal_add_test(tst_qquickspritesequence SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritesequence.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritesequence ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT 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 78a68c0f15..00b259e763 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}) -qt_add_test(tst_qquickstates +qt_internal_add_test(tst_qquickstates SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickstates.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickstates ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstates CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickstates CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT 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 bc73e9178c..a22a4157d7 100644 --- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickstyledtext Test: ##################################################################### -qt_add_test(tst_qquickstyledtext +qt_internal_add_test(tst_qquickstyledtext SOURCES tst_qquickstyledtext.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt index 57efc14e65..5951dc1d07 100644 --- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicksystempalette Test: ##################################################################### -qt_add_test(tst_qquicksystempalette +qt_internal_add_test(tst_qquicksystempalette SOURCES tst_qquicksystempalette.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_test(tst_qquicksystempalette ## Scopes: ##################################################################### -qt_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets +qt_internal_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 70456af1d6..04842aaae2 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}) -qt_add_test(tst_qquicktableview +qt_internal_add_test(tst_qquicktableview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,12 +39,12 @@ qt_add_test(tst_qquicktableview ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT 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 7b1edd910f..569347e287 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}) -qt_add_test(tst_qquicktext +qt_internal_add_test(tst_qquicktext SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_qquicktext ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktext CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktext CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT 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 7d2f750549..c2e52317fe 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}) -qt_add_test(tst_qquicktextdocument +qt_internal_add_test(tst_qquicktextdocument SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktextdocument.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquicktextdocument ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT 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 4a4cc3811e..57a955877b 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}) -qt_add_test(tst_qquicktextedit +qt_internal_add_test(tst_qquicktextedit SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,17 +35,17 @@ qt_add_test(tst_qquicktextedit ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextedit CONDITION MACOS +qt_internal_extend_target(tst_qquicktextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) -qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT 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 dff1a6f555..6e8d855a58 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}) -qt_add_test(tst_qquicktextinput +qt_internal_add_test(tst_qquicktextinput SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -29,17 +29,17 @@ qt_add_test(tst_qquicktextinput ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextinput CONDITION MACOS +qt_internal_extend_target(tst_qquicktextinput CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) -qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT 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 74e5c2bf7e..510baafaca 100644 --- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktextmetrics Test: ##################################################################### -qt_add_test(tst_qquicktextmetrics +qt_internal_add_test(tst_qquicktextmetrics SOURCES tst_qquicktextmetrics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt index 1d31d0b4b9..2ce3b2f8c4 100644 --- a/tests/auto/quick/qquicktimeline/CMakeLists.txt +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktimeline Test: ##################################################################### -qt_add_test(tst_qquicktimeline +qt_internal_add_test(tst_qquicktimeline SOURCES tst_qquicktimeline.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt index ce0f0fad68..16babb106a 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}) -qt_add_test(tst_qquickview +qt_internal_add_test(tst_qquickview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT 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 81e9fe3601..8222fd001f 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}) -qt_add_test(tst_qquickvisualdatamodel +qt_internal_add_test(tst_qquickvisualdatamodel SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,17 +34,17 @@ qt_add_test(tst_qquickvisualdatamodel ## Scopes: ##################################################################### -qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT 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 5d9f91280e..4b353cb277 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}) -qt_add_test(tst_qquickwindow +qt_internal_add_test(tst_qquickwindow SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT 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 970934b3fb..037ff85843 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}) -qt_add_test(tst_rendernode +qt_internal_add_test(tst_rendernode SOURCES ../../shared/util.cpp ../../shared/util.h tst_rendernode.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_rendernode ## Scopes: ##################################################################### -qt_extend_target(tst_rendernode CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_rendernode CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT 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 3e7fa6fe88..046629ba04 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scenegraph Test: ##################################################################### -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -29,12 +29,12 @@ qt_add_test(tst_scenegraph ## Scopes: ##################################################################### -qt_extend_target(tst_scenegraph CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_scenegraph CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT 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 17d2bec634..c69b150c97 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}) -qt_add_test(tst_sharedimage +qt_internal_add_test(tst_sharedimage SOURCES tst_sharedimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt index a07596018e..703f4f7578 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}) -qt_add_test(tst_touchmouse +qt_internal_add_test(tst_touchmouse SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_touchmouse ## Scopes: ##################################################################### -qt_extend_target(tst_touchmouse CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_touchmouse CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |