diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 19:13:03 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 10:22:34 +0000 |
| commit | 387f360b3b2634094889478f2b258e65a70b9aa6 (patch) | |
| tree | 7d9ebf04b46d2a25d41bae1cfb11db51daa2b318 /tests | |
| parent | e9cac99f3796740ea93b23b0fe893fc880e0b5d4 (diff) | |
Regenerate tests
Change-Id: I67a6c8f1659e7b471a4fcb92a2699292cf4eea81
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
220 files changed, 464 insertions, 1837 deletions
diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt index cceeab2f82..9dfec05256 100644 --- a/tests/auto/particles/qquickage/CMakeLists.txt +++ b/tests/auto/particles/qquickage/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickage - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickage.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickage TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickage.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickage.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt index 76c7edb765..aa31081b37 100644 --- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt +++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickangleddirection - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickangleddirection.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickangleddirection TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickangleddirection.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickangleddirection.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickangleddirection CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt index c5fcf48c42..baf55ff930 100644 --- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt +++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickcumulativedirection - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcumulativedirection.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickcumulativedirection TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickcumulativedirection.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickcumulativedirection.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt index 9a36a03a67..dd37fc9599 100644 --- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickcustomaffector - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcustomaffector.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickcustomaffector TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickcustomaffector.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickcustomaffector.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickcustomaffector CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt index c63b52027a..6df41b08bd 100644 --- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickcustomparticle - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcustomparticle.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickcustomparticle TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickcustomparticle.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickcustomparticle.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickcustomparticle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt index 2fcbc03d50..ffa8751587 100644 --- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickellipseextruder - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickellipseextruder.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickellipseextruder TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickellipseextruder.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickellipseextruder.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickellipseextruder CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt index e495b693a4..e404d91591 100644 --- a/tests/auto/particles/qquickfriction/CMakeLists.txt +++ b/tests/auto/particles/qquickfriction/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfriction - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfriction.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickfriction TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickfriction.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfriction.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfriction CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt index 4ddde296ba..4afb097e17 100644 --- a/tests/auto/particles/qquickgravity/CMakeLists.txt +++ b/tests/auto/particles/qquickgravity/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickgravity - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgravity.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickgravity TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickgravity.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickgravity.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickgravity CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt index 52a2b4bb3f..9fb39223dd 100644 --- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt +++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickgroupgoal - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgroupgoal.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickgroupgoal TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickgroupgoal.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickgroupgoal.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickgroupgoal CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt index 505e42bc03..c46568e32e 100644 --- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickimageparticle - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickimageparticle.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickimageparticle TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickimageparticle.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickimageparticle.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickimageparticle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt index 200950e251..c0db633f17 100644 --- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickitemparticle - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemparticle.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickitemparticle TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickitemparticle.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickitemparticle.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickitemparticle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt index eb99095029..3178315d90 100644 --- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt +++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicklineextruder - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicklineextruder.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquicklineextruder TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicklineextruder.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicklineextruder.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicklineextruder CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt index fd27aba91c..ea9ec81666 100644 --- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickmaskextruder - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickmaskextruder.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickmaskextruder TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickmaskextruder.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickmaskextruder.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickmaskextruder CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt index f881057601..469a070192 100644 --- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickparticlegroup - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlegroup.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickparticlegroup TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickparticlegroup.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickparticlegroup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickparticlegroup CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt index e13047ad1d..30ba359ccd 100644 --- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickparticlesystem - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlesystem.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickparticlesystem TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickparticlesystem.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickparticlesystem.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickparticlesystem CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt index 0093811ab0..0dd60223ec 100644 --- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt +++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpointattractor - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointattractor.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickpointattractor TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpointattractor.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpointattractor.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpointattractor CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt index c5b8489f20..128e6a202b 100644 --- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt +++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpointdirection - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointdirection.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickpointdirection TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpointdirection.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpointdirection.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpointdirection CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt index 0375792ac1..8b180893e8 100644 --- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickrectangleextruder - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickrectangleextruder.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickrectangleextruder TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickrectangleextruder.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickrectangleextruder.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt index e92e736257..ee298e96fb 100644 --- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt +++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickspritegoal - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritegoal.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickspritegoal TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickspritegoal.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickspritegoal.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickspritegoal CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt index af2e47f52c..e167d487dc 100644 --- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt +++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktargetdirection - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktargetdirection.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquicktargetdirection TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktargetdirection.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktargetdirection.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktargetdirection CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt index f305ba5179..2ae5c0a108 100644 --- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt +++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktrailemitter - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktrailemitter.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquicktrailemitter TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktrailemitter.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktrailemitter.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktrailemitter CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt index 67151dbc55..9409f54053 100644 --- a/tests/auto/particles/qquickturbulence/CMakeLists.txt +++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickturbulence - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickturbulence.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickturbulence TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickturbulence.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickturbulence.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickturbulence CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt index 412ae65872..440afb7d4d 100644 --- a/tests/auto/particles/qquickwander/CMakeLists.txt +++ b/tests/auto/particles/qquickwander/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickwander - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickwander.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qquickwander TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickwander.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickwander.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickwander CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt index 4209ef7540..36b6c071dc 100644 --- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qabstractanimationjob - GUI SOURCES tst_qabstractanimationjob.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_qabstractanimationjob Qt::Qml ) -#### Keys ignored in scope 1:.:.:qabstractanimationjob.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qabstractanimationjob.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt index a5f88c0e5f..c51fb2e754 100644 --- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qanimationgroupjob - GUI SOURCES tst_qanimationgroupjob.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_qanimationgroupjob Qt::Qml ) -#### Keys ignored in scope 1:.:.:qanimationgroupjob.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qanimationgroupjob.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt index c1e654f315..2b73283ad5 100644 --- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qparallelanimationgroupjob - GUI SOURCES tst_qparallelanimationgroupjob.cpp LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qparallelanimationgroupjob Qt::Qml ) -#### Keys ignored in scope 1:.:.:qparallelanimationgroupjob.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qparallelanimationgroupjob.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt index d8a35a3507..e5324af19d 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qpauseanimationjob - GUI SOURCES tst_qpauseanimationjob.cpp LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qpauseanimationjob Qt::Qml ) -#### Keys ignored in scope 1:.:.:qpauseanimationjob.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qpauseanimationjob.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt index 435aac31eb..7240f53dea 100644 --- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qsequentialanimationgroupjob - GUI SOURCES tst_qsequentialanimationgroupjob.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_qsequentialanimationgroupjob Qt::Qml ) -#### Keys ignored in scope 1:.:.:qsequentialanimationgroupjob.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qsequentialanimationgroupjob.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt index c248969091..b214d50b7c 100644 --- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt +++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_bindingdependencyapi - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_bindingdependencyapi.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_bindingdependencyapi TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:bindingdependencyapi.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:bindingdependencyapi.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt index 26b9635206..343d75058f 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qdebugmessageservice - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -34,15 +31,11 @@ add_qt_test(tst_qdebugmessageservice ) #### Keys ignored in scope 1:.:.:qdebugmessageservice.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/test.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qdebugmessageservice.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt index 08f8ae3694..d162ebc572 100644 --- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qpacketprotocol - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -24,15 +23,9 @@ add_qt_test(tst_qpacketprotocol Qt::QmlDebug ) -#### Keys ignored in scope 1:.:.:qpacketprotocol.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qpacketprotocol.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt index 4e52ab57cf..76e0a404f3 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmldebugclient - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt index 59a5aa9fa1..8e26af3cd0 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmldebuggingenabler - GUI SOURCES ../../../../shared/util.cpp ../../../../shared/util.h ../../shared/debugutil.cpp ../../shared/debugutil_p.h @@ -25,15 +24,11 @@ add_qt_test(tst_qqmldebuggingenabler ) #### Keys ignored in scope 1:.:.:qqmldebuggingenabler.pro:<TRUE>: -# CONFIG = "testcase" "-debug_and_release_target" # OTHER_FILES = "data/test.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmldebuggingenabler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d5b3277b82 --- /dev/null +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qqmldebuggingenablerserver.pro. + +##################################################################### +## qqmldebuggingenablerserver Binary: +##################################################################### + +add_qt_executable(qqmldebuggingenablerserver + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler" + SOURCES + qqmldebuggingenablerserver.cpp + DEFINES + QT_QML_DEBUG_NO_WARNING + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Test +) + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt index 3633878156..070c2a78bf 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt @@ -5,10 +5,11 @@ ##################################################################### add_qt_executable(qqmldebuggingenablerserver + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler" # special case begin - # Remove OUTPUT_DIRECTORY and INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS] + # Remove INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS] # as these are invalid - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler" + # INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler" # special case end SOURCES qqmldebuggingenablerserver.cpp @@ -22,11 +23,5 @@ add_qt_executable(qqmldebuggingenablerserver Qt::Test ) -#### Keys ignored in scope 1:.:.:qqmldebuggingenablerserver.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmldebuggingenablerserver.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt index 79279f1622..b20af4731b 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmldebugjs - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -33,15 +30,11 @@ add_qt_test(tst_qqmldebugjs ) #### Keys ignored in scope 1:.:.:qqmldebugjs.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/test.qml" "data/test.js" "data/timer.qml" "data/exception.qml" "data/oncompleted.qml" "data/loadjsfile.qml" "data/condition.qml" "data/changeBreakpoint.qml" "data/stepAction.qml" "data/breakpointRelocation.qml" "data/createComponent.qml" "data/encodeQmlScope.qml" "data/breakOnAnchor.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmldebugjs.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c7cbb71db7 --- /dev/null +++ b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qqmldebugjsserver.pro. + +##################################################################### +## qqmldebugjsserver Binary: +##################################################################### + +add_qt_executable(qqmldebugjsserver + OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" + SOURCES + qqmldebugjsserver.cpp + DEFINES + QT_QML_DEBUG_NO_WARNING + INCLUDE_DIRECTORIES + ../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Test +) + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt index da24e79040..85a682ff93 100644 --- a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt @@ -4,13 +4,10 @@ ## qqmldebugjsserver Binary: ##################################################################### -# special case begin -# Remove INSTALL_DIRECTORY and INSTALL_DIRECTORY from this test a -# use the one from special case instead -# special case end add_qt_executable(qqmldebugjsserver # special case begin OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + # INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" # special case end SOURCES qqmldebugjsserver.cpp @@ -26,6 +23,3 @@ add_qt_executable(qqmldebugjsserver ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmldebugjsserver.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt index b4ba42d140..27c968b5bb 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmldebuglocal - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -28,15 +27,9 @@ add_qt_test(tst_qqmldebuglocal Qt::QmlDebug ) -#### Keys ignored in scope 1:.:.:qqmldebuglocal.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmldebuglocal.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt index 3af7cb42bb..bfa8ec10d3 100644 --- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmldebugprocess - GUI SOURCES ../../shared/qqmldebugprocess.cpp ../../shared/qqmldebugprocess_p.h tst_qqmldebugprocess.cpp @@ -13,11 +12,5 @@ add_qt_test(tst_qqmldebugprocess ../../shared ) -#### Keys ignored in scope 1:.:.:qqmldebugprocess.pro:<TRUE>: -# CONFIG = "testcase" "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmldebugprocess.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0f39b6c1c3 --- /dev/null +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qqmldebugprocessprocess.pro. + +##################################################################### +## qqmldebugprocessprocess Binary: +##################################################################### + +add_qt_executable(qqmldebugprocessprocess + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess" + SOURCES + qqmldebugprocessprocess.cpp +) + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt index 3a1bbae9f4..c6e2aedb78 100644 --- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt @@ -4,24 +4,16 @@ ## qqmldebugprocessprocess Binary: ##################################################################### -# special case begin -# Remove OUTPUT_DIRECTORY and INSTALL_DIRECTORY which start with -# $$[QT_INSTALL_TESTS] -# special case end - add_qt_executable(qqmldebugprocessprocess -# special case begin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess" +# special case begin +# Remove INSTALL_DIRECTORY which starts with +# $$[QT_INSTALL_TESTS] +# INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess" # special case end SOURCES qqmldebugprocessprocess.cpp ) -#### Keys ignored in scope 1:.:.:qqmldebugprocessprocess.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" "console" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmldebugprocessprocess.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt index 0e93b2b55f..b203440f1a 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmldebugservice - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -38,15 +35,11 @@ add_qt_test(tst_qqmldebugservice ) #### Keys ignored in scope 1:.:.:qqmldebugservice.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/test.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmldebugservice.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt index 6c2da84ce8..bf90555c47 100644 --- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlenginecontrol - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -33,15 +30,11 @@ add_qt_test(tst_qqmlenginecontrol ) #### Keys ignored in scope 1:.:.:qqmlenginecontrol.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/test.qml" "data/exit.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlenginecontrol.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt index 0b3a8e8ffc..b4d382bb37 100644 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlenginedebuginspectorintegration - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -32,15 +29,9 @@ add_qt_test(tst_qqmlenginedebuginspectorintegration TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlenginedebuginspectorintegrationtest.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlenginedebuginspectorintegrationtest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt index 9235577d89..128ac8d0cb 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlenginedebugservice - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -26,15 +25,9 @@ add_qt_test(tst_qqmlenginedebugservice Qt::Quick ) -#### Keys ignored in scope 1:.:.:qqmlenginedebugservice.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlenginedebugservice.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt index 470d46880a..5220a77d41 100644 --- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlinspector - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -32,15 +29,9 @@ add_qt_test(tst_qqmlinspector TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlinspector.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlinspector.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt index 117417baf7..86722a769c 100644 --- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlnativeconnector - GUI SOURCES tst_qqmlnativeconnector.cpp DEFINES diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt index fb8deee316..4f2e3aafde 100644 --- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt @@ -14,7 +14,6 @@ list(APPEND test_data "data/zoom.qml") list(APPEND test_data "data/i18n/qml_fr_FR.qm") add_qt_test(tst_qqmlpreview - GUI SOURCES ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h ../../../shared/util.cpp ../../../shared/util.h @@ -34,15 +33,9 @@ add_qt_test(tst_qqmlpreview TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlpreview.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlpreview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt index 4ddb2cadbd..8e5af6d4e7 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlprofilerservice - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -32,15 +29,11 @@ add_qt_test(tst_qqmlprofilerservice ) #### Keys ignored in scope 1:.:.:qqmlprofilerservice.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/pixmapCacheTest.qml" "data/controlFromJS.qml" "data/test.qml" "data/exit.qml" "data/scenegraphTest.qml" "data/TestImage_2x2.png" "data/signalSourceLocation.qml" "data/javascript.qml" "data/timer.qml" "data/qstr.qml" "data/memory.qml" "data/batchOverflow.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlprofilerservice.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index a0e474578c..9238e3c402 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qv4debugger - GUI SOURCES ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h @@ -23,11 +22,5 @@ add_qt_test(tst_qv4debugger Qt::Qml ) -#### Keys ignored in scope 1:.:.:qv4debugger.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qv4debugger.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt index 52317655c4..c3b23fb30d 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_tool(qjstest #### Keys ignored in scope 1:.:.:qjstest.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "Javascript" "test" "runner" # TEMPLATE = "app" -# _LOADED = "qt_tool" diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt index 2a2a67e25f..bf739790db 100644 --- a/tests/auto/qml/parserstress/CMakeLists.txt +++ b/tests/auto/qml/parserstress/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "tests/*") + tests/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_parserstress - GUI SOURCES tst_parserstress.cpp LIBRARIES @@ -26,11 +23,5 @@ add_qt_test(tst_parserstress TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:parserstress.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:parserstress.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt index 2d5980760f..f3534f59dd 100644 --- a/tests/auto/qml/qjsengine/CMakeLists.txt +++ b/tests/auto/qml/qjsengine/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "script/*") + script/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qjsengine - GUI SOURCES tst_qjsengine.cpp LIBRARIES @@ -27,31 +24,33 @@ add_qt_test(tst_qjsengine ) # Resources: +set(qjsengine_resource_files + "translations/idtranslatable-unicode.qm" + "translations/idtranslatable_la.qm" + "translations/translatable-unicode.qm" + "translations/translatable_la.qm" +) + add_qt_resource(tst_qjsengine "qjsengine" PREFIX "/" FILES - translations/idtranslatable-unicode.qm - translations/idtranslatable_la.qm - translations/translatable-unicode.qm - translations/translatable_la.qm + ${qjsengine_resource_files} +) +set(qmake_immediate_resource_files + "exporterror1.mjs" + "importerror1.mjs" + "modulewithlexicals.mjs" + "testmodule.mjs" ) + add_qt_resource(tst_qjsengine "qmake_immediate" PREFIX "/" FILES - exporterror1.mjs - importerror1.mjs - modulewithlexicals.mjs - testmodule.mjs + ${qmake_immediate_resource_files} ) -#### Keys ignored in scope 1:.:.:qjsengine.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qjsengine.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt index dbc0f2d2d6..bdd272fc30 100644 --- a/tests/auto/qml/qjsonbinding/CMakeLists.txt +++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qjsonbinding - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qjsonbinding.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qjsonbinding TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qjsonbinding.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qjsonbinding.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt index 9e0e1b7d13..7f3b749aa4 100644 --- a/tests/auto/qml/qjsvalue/CMakeLists.txt +++ b/tests/auto/qml/qjsvalue/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qjsvalue - GUI SOURCES tst_qjsvalue.cpp tst_qjsvalue.h LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qjsvalue Qt::Widgets ) -#### Keys ignored in scope 1:.:.:qjsvalue.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qjsvalue.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt index ca3bf5c250..a347407f91 100644 --- a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt +++ b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_test(tst_qjsvalueiterator - GUI SOURCES tst_qjsvalueiterator.cpp PUBLIC_LIBRARIES Qt::Qml ) -#### Keys ignored in scope 1:.:.:qjsvalueiterator.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qjsvalueiterator.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index 46a692eb4e..7d61ab5893 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -97,21 +97,22 @@ add_qt_resource(tst_qmlcachegen "qmake_immediate" ## Scopes: ##################################################################### -# Resources: -set_source_files_properties("data/umlaut.qml" - PROPERTIES QT_RESOURCE_ALIAS "Bäh.qml" -) -set(trickypaths_umlaut_resource_files - "data/umlaut.qml" -) - -add_qt_resource(tst_qmlcachegen "trickypaths_umlaut" - PREFIX - "/" - FILES - ${trickypaths_umlaut_resource_files} -) +if(UNIX) + # Resources: + set_source_files_properties("data/umlaut.qml" + PROPERTIES QT_RESOURCE_ALIAS "Bäh.qml" + ) + set(trickypaths_umlaut_resource_files + "data/umlaut.qml" + ) + add_qt_resource(tst_qmlcachegen "trickypaths_umlaut" + PREFIX + "/" + FILES + ${trickypaths_umlaut_resource_files} + ) +endif() extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS DEFINES diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt new file mode 100644 index 0000000000..927aa9f558 --- /dev/null +++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qmldiskcache.pro. + +##################################################################### +## tst_qmldiskcache Test: +##################################################################### + +add_qt_test(tst_qmldiskcache + SOURCES + tst_qmldiskcache.cpp + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml +) + +# Resources: +set(qmake_immediate_resource_files + "importmodule.qml" + "module.mjs" + "test.qml" +) + +add_qt_resource(tst_qmldiskcache "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt index 096641cae9..30019a8da8 100644 --- a/tests/auto/qml/qmldiskcache/CMakeLists.txt +++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qmldiskcache - GUI SOURCES tst_qmldiskcache.cpp LIBRARIES @@ -28,21 +27,19 @@ set_source_files_properties( # special case end # Resources: +set(qmake_immediate_resource_files + "importmodule.qml" + "module.mjs" + "test.qml" +) + add_qt_resource(tst_qmldiskcache "qmake_immediate" PREFIX "/" FILES - importmodule.qml - module.mjs - test.qml + ${qmake_immediate_resource_files} ) -#### Keys ignored in scope 1:.:.:qmldiskcache.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qmldiskcache.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qmlmin/CMakeLists.txt b/tests/auto/qml/qmlmin/CMakeLists.txt index 18fa793f07..76bba7e42f 100644 --- a/tests/auto/qml/qmlmin/CMakeLists.txt +++ b/tests/auto/qml/qmlmin/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qmlmin - GUI SOURCES tst_qmlmin.cpp DEFINES @@ -17,15 +16,9 @@ add_qt_test(tst_qmlmin Qt::Qml ) -#### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qmlmin.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt DEFINES QTEST_CROSS_COMPILED diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt index 6adbba2b49..95a2659ec8 100644 --- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_executable(testapp - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp PUBLIC_LIBRARIES @@ -14,17 +14,20 @@ add_qt_executable(testapp ) # Resources: +set(main_resource_files + "delayedExit.qml" + "delayedQuit.qml" + "immediateExit.qml" + "immediateQuit.qml" +) + add_qt_resource(testapp "main" PREFIX "/" FILES - delayedExit.qml - delayedQuit.qml - immediateExit.qml - immediateQuit.qml + ${main_resource_files} ) #### Keys ignored in scope 1:.:.:testapp.pro:<TRUE>: -# CONFIG = "-app_bundle" "console" # TEMPLATE = "app" diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt index 9b4594cb00..3ebbbd46b1 100644 --- a/tests/auto/qml/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlbinding - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlbinding.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qqmlbinding TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlbinding.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlbinding.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt index f91ac975c3..ad688cd556 100644 --- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlhangeset - GUI SOURCES tst_qqmlchangeset.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_qqmlhangeset Qt::QmlModels ) -#### Keys ignored in scope 1:.:.:qqmlchangeset.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlchangeset.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index 46a8d11b3c..0ee7103dc6 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlcomponent - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -34,22 +31,21 @@ add_qt_test(tst_qqmlcomponent ) # Resources: +set(qmake_immediate_resource_files + "data/QtObjectComponent.qml" +) + add_qt_resource(tst_qqmlcomponent "qmake_immediate" PREFIX "/" FILES - data/QtObjectComponent.qml + ${qmake_immediate_resource_files} ) -#### Keys ignored in scope 1:.:.:qqmlcomponent.pro:<TRUE>: -# CONFIG = "testcase" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlcomponent.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt index 22a768036d..5874b19fbf 100644 --- a/tests/auto/qml/qqmlconnections/CMakeLists.txt +++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlconnections - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlconnections.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qqmlconnections TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlconnections.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlconnections.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt index 1f2c3d129d..dd9fea6721 100644 --- a/tests/auto/qml/qqmlconsole/CMakeLists.txt +++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlconsole - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlconsole.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qqmlconsole TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlconsole.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlconsole.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt index fb555bef2a..741bfec4c0 100644 --- a/tests/auto/qml/qqmlcontext/CMakeLists.txt +++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlcontext - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlcontext.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlcontext TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlcontext.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlcontext.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt index fbb1863d43..1c8bb7fca8 100644 --- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt +++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlcpputils - GUI SOURCES tst_qqmlcpputils.cpp LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qqmlcpputils Qt::Qml ) -#### Keys ignored in scope 1:.:.:qqmlcpputils.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlcpputils.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt index 30efe97fed..73ac9f64e4 100644 --- a/tests/auto/qml/qqmldirparser/CMakeLists.txt +++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmldirparser - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmldirparser.cpp diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt index a2d34733e1..f0b3407a39 100644 --- a/tests/auto/qml/qqmlerror/CMakeLists.txt +++ b/tests/auto/qml/qqmlerror/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlerror - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlerror.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlerror TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlerror.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlerror.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt index 42643ad841..e331e5435e 100644 --- a/tests/auto/qml/qqmlexpression/CMakeLists.txt +++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlexpression - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlexpression.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlexpression TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlexpression.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlexpression.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt index 4080517fa4..6d5bc136cc 100644 --- a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlextensionplugin - GUI SOURCES tst_qqmlextensionplugin.cpp PUBLIC_LIBRARIES @@ -13,11 +12,5 @@ add_qt_test(tst_qqmlextensionplugin Qt::Qml ) -#### Keys ignored in scope 1:.:.:qqmlextensionplugin.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlextensionplugin.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlfile/CMakeLists.txt b/tests/auto/qml/qqmlfile/CMakeLists.txt index 387e7029dc..f1babe3e02 100644 --- a/tests/auto/qml/qqmlfile/CMakeLists.txt +++ b/tests/auto/qml/qqmlfile/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlfile - GUI SOURCES tst_qqmlfile.cpp PUBLIC_LIBRARIES @@ -13,11 +12,5 @@ add_qt_test(tst_qqmlfile Qt::Qml ) -#### Keys ignored in scope 1:.:.:qqmlfile.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlfile.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt index c074abad74..1ef35f88b3 100644 --- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt +++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlfileselector - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlfileselector.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlfileselector TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlfileselector.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlfileselector.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt index 3a8f175d76..54986b5e80 100644 --- a/tests/auto/qml/qqmlglobal/CMakeLists.txt +++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlglobal - GUI SOURCES tst_qqmlglobal.cpp LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qqmlglobal Qt::Qml ) -#### Keys ignored in scope 1:.:.:qqmlglobal.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlglobal.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt index 50b588cb04..f81706365f 100644 --- a/tests/auto/qml/qqmlimport/CMakeLists.txt +++ b/tests/auto/qml/qqmlimport/CMakeLists.txt @@ -5,33 +5,24 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "MyPluginSupported/*") + MyPluginSupported/*) list(APPEND test_data ${test_data_glob}) - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "MyPluginUnsupported/*") + MyPluginUnsupported/*) list(APPEND test_data ${test_data_glob}) - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "FormFromQmlDir/*") + FormFromQmlDir/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlimport - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlimport.cpp diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt index c46519e533..6ceddbd357 100644 --- a/tests/auto/qml/qqmlincubator/CMakeLists.txt +++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlincubator - GUI SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -31,15 +28,9 @@ add_qt_test(tst_qqmlincubator TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlincubator.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlincubator.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt index b676d6bd2a..a852cce2a0 100644 --- a/tests/auto/qml/qqmlinfo/CMakeLists.txt +++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlinfo - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlinfo.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlinfo TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlinfo.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlinfo.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt index 16efb35c65..dbf8c2e35e 100644 --- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt +++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlinstantiator - GUI SOURCES ../../shared/util.cpp ../../shared/util.h stringmodel.h @@ -32,15 +29,9 @@ add_qt_test(tst_qqmlinstantiator TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlinstantiator.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlinstantiator.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt index a53621b8d4..543e9e1ea3 100644 --- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt +++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlnotifier - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlnotifier.cpp @@ -25,15 +22,9 @@ add_qt_test(tst_qqmlnotifier TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlnotifier.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlnotifier.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt index cb184f9abd..fa4e9c5913 100644 --- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlobjectmodel - GUI SOURCES tst_qqmlobjectmodel.cpp LIBRARIES @@ -18,11 +17,5 @@ add_qt_test(tst_qqmlobjectmodel Qt::QmlModels ) -#### Keys ignored in scope 1:.:.:qqmlobjectmodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlobjectmodel.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt index 58120cacae..8920bd8528 100644 --- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlopenmetaobject - GUI SOURCES tst_qqmlopenmetaobject.cpp LIBRARIES @@ -17,11 +16,5 @@ add_qt_test(tst_qqmlopenmetaobject Qt::Qml ) -#### Keys ignored in scope 1:.:.:qqmlopenmetaobject.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmlopenmetaobject.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index ef7113d6cc..7c327dcfca 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlparser - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlparser.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlparser TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlparser.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlparser.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlparser CONDITION cross_compile DEFINES QTEST_CROSS_COMPILED diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt index d8c5caa6d2..9f8b4ef1c2 100644 --- a/tests/auto/qml/qqmlpromise/CMakeLists.txt +++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlpromise - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlpromise.cpp @@ -32,16 +29,12 @@ add_qt_test(tst_qqmlpromise ) #### Keys ignored in scope 1:.:.:qqmlpromise.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/then-fulfilled-non-callable.qml" "data/then-reject-non-callable.qml" "data/then-resolve-multiple-then.qml" "data/then-resolve-chaining.qml" "data/then-reject-chaining.qml" "data/promise-resolve-with-value.qml" "data/promise-resolve-with-promise.qml" "data/promise-reject-with-value.qml" "data/promise-executor-resolve.qml" "data/promise-get-length.qml" "data/promise-executor-reject.qml" "data/promise-reject-catch.qml" "data/promise-async-resolve-with-value.qml" "data/promise-async-reject-with-value.qml" "data/promise-all-resolve.qml" "data/promise-all-empty-input.qml" "data/promise-resolve-with-array.qml" "data/promise-all-reject-reject-is-last.qml" "data/promise-all-reject-reject-is-mid.qml" "data/promise-race-resolve-1st.qml" "data/promise-race-empty-input.qml" "data/promise-race-resolve-2nd.qml" "data/promise-race-resolve-1st-in-executor-function.qml" "data/promise-resolve-is-a-function.qml" "data/promise-resolve-function-length.qml" "data/promise-all-invoke-then-method.qml" "data/promise-resolve-with-empty.qml" "data/promise-executor-throw-exception.qml" "data/promise-executor-function-extensible.qml" "data/promise-all-noniterable-input.qml" # OTHER_FILES = <EMPTY> ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlpromise.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index 6ef1e1fbba..f34d6c372f 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlproperty - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlproperty.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlproperty TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlproperty.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlproperty.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt index be7eb3eb13..b5ae21f026 100644 --- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt +++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlpropertycache - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlpropertycache.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qqmlpropertycache TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlpropertycache.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlpropertycache.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt index 8de072b253..e6b835d89a 100644 --- a/tests/auto/qml/qqmlqt/CMakeLists.txt +++ b/tests/auto/qml/qqmlqt/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlqt - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlqt.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qqmlqt TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlqt.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlqt.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt index a51dd56958..cf0628867c 100644 --- a/tests/auto/qml/qqmlsettings/CMakeLists.txt +++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlsettings - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlsettings.cpp @@ -25,15 +22,9 @@ add_qt_test(tst_qqmlsettings TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlsettings.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlsettings.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt index a06a2196b7..f5928edd4e 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt +++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlxmlhttprequest - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -31,15 +28,9 @@ add_qt_test(tst_qqmlxmlhttprequest TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlxmlhttprequest.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlxmlhttprequest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt index d4d6441187..db4af83706 100644 --- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfolderlistmodel - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfolderlistmodel.cpp @@ -30,25 +27,23 @@ add_qt_test(tst_qquickfolderlistmodel ) # Resources: +set(introspect_resource_files + "txtdir/hello.txt" +) + add_qt_resource(tst_qquickfolderlistmodel "introspect" PREFIX "/myprefix/subdir" BASE "data" FILES - txtdir/hello.txt + ${introspect_resource_files} ) -#### Keys ignored in scope 1:.:.:qquickfolderlistmodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfolderlistmodel.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt index f31cb3d0fd..0d7a3f4df9 100644 --- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfolderlistmodel - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfolderlistmodel.cpp @@ -33,25 +30,23 @@ add_qt_test(tst_qquickfolderlistmodel set_source_files_properties(data/txtdir/hello.txt PROPERTIES QT_RESOURCE_ALIAS "txtdir/hello.txt") # special case end # Resources: +set(introspect_resource_files + "txtdir/hello.txt" +) + add_qt_resource(tst_qquickfolderlistmodel "introspect" PREFIX "/myprefix/subdir" BASE "data" FILES - txtdir/hello.txt + ${introspect_resource_files} ) -#### Keys ignored in scope 1:.:.:qquickfolderlistmodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfolderlistmodel.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt index b29fd3fc25..08f223d763 100644 --- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickworkerscript - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickworkerscript.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquickworkerscript TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickworkerscript.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickworkerscript.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt index 473115e384..e2401230e5 100644 --- a/tests/auto/qml/qrcqml/CMakeLists.txt +++ b/tests/auto/qml/qrcqml/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qrcqml - GUI SOURCES tst_qrcqml.cpp PUBLIC_LIBRARIES @@ -23,16 +22,20 @@ set_source_files_properties("data/importtest.qml" set_source_files_properties("data/main2.qml" PROPERTIES QT_RESOURCE_ALIAS "main.qml" ) +set(qrcqml_resource_files + "data/SameDir.qml" + "data/SameDir2.qml" + "data/SubDir.qml" + "data/importtest.qml" + "data/main.qml" + "data/main2.qml" +) + add_qt_resource(tst_qrcqml "qrcqml" PREFIX "/" FILES - data/SameDir.qml - data/SameDir2.qml - data/SubDir.qml - data/importtest.qml - data/main.qml - data/main2.qml + ${qrcqml_resource_files} ) set_source_files_properties("data/SameDir3.qml" PROPERTIES QT_RESOURCE_ALIAS "SameDir.qml" @@ -40,21 +43,29 @@ set_source_files_properties("data/SameDir3.qml" set_source_files_properties("data/main3.qml" PROPERTIES QT_RESOURCE_ALIAS "main.qml" ) +set(qrcqml1_resource_files + "data/SameDir3.qml" + "data/main3.qml" +) + add_qt_resource(tst_qrcqml "qrcqml1" PREFIX "/search" FILES - data/SameDir3.qml - data/main3.qml + ${qrcqml1_resource_files} ) set_source_files_properties("data/SubDir.qml" PROPERTIES QT_RESOURCE_ALIAS "SubDir.qml" ) +set(qrcqml2_resource_files + "data/SubDir.qml" +) + add_qt_resource(tst_qrcqml "qrcqml2" PREFIX "/search/data" FILES - data/SubDir.qml + ${qrcqml2_resource_files} ) set_source_files_properties("data/imports/QrcImport/Imported.qml" PROPERTIES QT_RESOURCE_ALIAS "QrcImport/Imported.qml" @@ -62,20 +73,18 @@ set_source_files_properties("data/imports/QrcImport/Imported.qml" set_source_files_properties("data/imports/QrcImport/qmldir" PROPERTIES QT_RESOURCE_ALIAS "QrcImport/qmldir" ) +set(qrcqml3_resource_files + "data/imports/QrcImport/Imported.qml" + "data/imports/QrcImport/qmldir" +) + add_qt_resource(tst_qrcqml "qrcqml3" PREFIX "/imports" FILES - data/imports/QrcImport/Imported.qml - data/imports/QrcImport/qmldir + ${qrcqml3_resource_files} ) -#### Keys ignored in scope 1:.:.:qrcqml.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qrcqml.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt index 5e5bec357e..7fd1021715 100644 --- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt +++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qtqmlmodules - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qtqmlmodules.cpp @@ -29,15 +26,9 @@ add_qt_test(tst_qtqmlmodules TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qtqmlmodules.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qtqmlmodules.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt index 0dccff91a2..dd1d0d542a 100644 --- a/tests/auto/qml/qv4assembler/CMakeLists.txt +++ b/tests/auto/qml/qv4assembler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qv4assembler - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qv4assembler.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qv4assembler TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qv4assembler.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qv4assembler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt index 2420c4add9..b249d36a25 100644 --- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt +++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qv4identifiertable - GUI SOURCES tst_qv4identifiertable.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_qv4identifiertable Qt::Qml ) -#### Keys ignored in scope 1:.:.:qv4identifiertable.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qv4identifiertable.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt index 129331698c..db84a6a36b 100644 --- a/tests/auto/qml/qv4mm/CMakeLists.txt +++ b/tests/auto/qml/qv4mm/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qv4mm - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qv4mm.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qv4mm TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qv4mm.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qv4mm.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt index 06db7718aa..2044b6758e 100644 --- a/tests/auto/qml/qv4regexp/CMakeLists.txt +++ b/tests/auto/qml/qv4regexp/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qv4regexp - GUI SOURCES tst_qv4regexp.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_qv4regexp Qt::Qml ) -#### Keys ignored in scope 1:.:.:qv4regexp.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qv4regexp.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt index a36558f295..b297800281 100644 --- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt +++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qwidgetsinqml - GUI SOURCES tst_qwidgetsinqml.cpp DEFINES @@ -18,11 +17,5 @@ add_qt_test(tst_qwidgetsinqml Qt::Widgets ) -#### Keys ignored in scope 1:.:.:qwidgetsinqml.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qwidgetsinqml.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt index fa2cf07687..ff9849da1e 100644 --- a/tests/auto/qml/v4misc/CMakeLists.txt +++ b/tests/auto/qml/v4misc/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_v4misc - GUI SOURCES tst_v4misc.cpp LIBRARIES @@ -16,11 +15,5 @@ add_qt_test(tst_v4misc Qt::Qml ) -#### Keys ignored in scope 1:.:.:v4misc.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:v4misc.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qmldevtools/compile/CMakeLists.txt b/tests/auto/qmldevtools/compile/CMakeLists.txt index 50ed8fafab..f463285ca0 100644 --- a/tests/auto/qmldevtools/compile/CMakeLists.txt +++ b/tests/auto/qmldevtools/compile/CMakeLists.txt @@ -16,7 +16,6 @@ add_qt_executable(tst_compile ) #### Keys ignored in scope 1:.:.:compile.pro:<TRUE>: -# _LOADED = "qt_common" # _OPTION = "host_build" ## Scopes: @@ -29,16 +28,7 @@ extend_target(tst_compile CONDITION force_bootstrap Qt::Bootstrap ) -#### Keys ignored in scope 3:.:.:compile.pro:NOT build_pass: -# CONFIG = "release" - extend_target(tst_compile CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::Core ) - -#### Keys ignored in scope 5:.:.:compile.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - -#### Keys ignored in scope 6:.:.:compile.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt index 3a6960d0b6..81fbedd01a 100644 --- a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt +++ b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(shortcut PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:shortcut.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/animatedimage/CMakeLists.txt b/tests/auto/qmltest/animatedimage/CMakeLists.txt index 451df87b1a..a8070a4f1d 100644 --- a/tests/auto/qmltest/animatedimage/CMakeLists.txt +++ b/tests/auto/qmltest/animatedimage/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(animatedimage PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:animatedimage.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/animations/CMakeLists.txt b/tests/auto/qmltest/animations/CMakeLists.txt index c8ad44470c..ba445ce942 100644 --- a/tests/auto/qmltest/animations/CMakeLists.txt +++ b/tests/auto/qmltest/animations/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(animations PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:animations.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/borderimage/CMakeLists.txt b/tests/auto/qmltest/borderimage/CMakeLists.txt index 0f18da2aed..1b96fc2c00 100644 --- a/tests/auto/qmltest/borderimage/CMakeLists.txt +++ b/tests/auto/qmltest/borderimage/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(borderimage PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:borderimage.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/buttonclick/CMakeLists.txt b/tests/auto/qmltest/buttonclick/CMakeLists.txt index 22fabf12c0..97d6cabd3b 100644 --- a/tests/auto/qmltest/buttonclick/CMakeLists.txt +++ b/tests/auto/qmltest/buttonclick/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(buttonclick PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:buttonclick.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/createbenchmark/CMakeLists.txt b/tests/auto/qmltest/createbenchmark/CMakeLists.txt index f75c482a53..971fced83e 100644 --- a/tests/auto/qmltest/createbenchmark/CMakeLists.txt +++ b/tests/auto/qmltest/createbenchmark/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(createbenchmark PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:createbenchmark.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/events/CMakeLists.txt b/tests/auto/qmltest/events/CMakeLists.txt index 952f7bbf04..0fc18078bf 100644 --- a/tests/auto/qmltest/events/CMakeLists.txt +++ b/tests/auto/qmltest/events/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(events PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:events.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/fontloader/CMakeLists.txt b/tests/auto/qmltest/fontloader/CMakeLists.txt index 959e5ee0a5..f9c9ce046f 100644 --- a/tests/auto/qmltest/fontloader/CMakeLists.txt +++ b/tests/auto/qmltest/fontloader/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(fontloader PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:fontloader.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/gradient/CMakeLists.txt b/tests/auto/qmltest/gradient/CMakeLists.txt index f5df3d81e1..18e723f65a 100644 --- a/tests/auto/qmltest/gradient/CMakeLists.txt +++ b/tests/auto/qmltest/gradient/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(gradient PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:gradient.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/image/CMakeLists.txt b/tests/auto/qmltest/image/CMakeLists.txt index 27cb68760a..079aaa0e4b 100644 --- a/tests/auto/qmltest/image/CMakeLists.txt +++ b/tests/auto/qmltest/image/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(image PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:image.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/itemgrabber/CMakeLists.txt b/tests/auto/qmltest/itemgrabber/CMakeLists.txt index 41480f3e0a..eb231f7e78 100644 --- a/tests/auto/qmltest/itemgrabber/CMakeLists.txt +++ b/tests/auto/qmltest/itemgrabber/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(itemgrabber PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:itemgrabber.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/layout/CMakeLists.txt b/tests/auto/qmltest/layout/CMakeLists.txt index 2295b12bdd..45b320b368 100644 --- a/tests/auto/qmltest/layout/CMakeLists.txt +++ b/tests/auto/qmltest/layout/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(layout PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:layout.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/listmodel/CMakeLists.txt b/tests/auto/qmltest/listmodel/CMakeLists.txt index 6979cc4ece..5b9b24ccb2 100644 --- a/tests/auto/qmltest/listmodel/CMakeLists.txt +++ b/tests/auto/qmltest/listmodel/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(listmodel PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:listmodel.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/listview/CMakeLists.txt b/tests/auto/qmltest/listview/CMakeLists.txt index c86723c120..6f79e86afb 100644 --- a/tests/auto/qmltest/listview/CMakeLists.txt +++ b/tests/auto/qmltest/listview/CMakeLists.txt @@ -12,5 +12,4 @@ add_qt_test(listview ) #### Keys ignored in scope 1:.:.:listview.pro:<TRUE>: -# CONFIG = "qmltestcase" -# DISTFILES = "$$PWD/tst_listview.qml" "$$files$$PWD/data/*.qml" +# DISTFILES = "$$PWD/tst_listview.qml" "$$PWD/data/*.qml" diff --git a/tests/auto/qmltest/objectmodel/CMakeLists.txt b/tests/auto/qmltest/objectmodel/CMakeLists.txt index beaecf03bc..426c401a54 100644 --- a/tests/auto/qmltest/objectmodel/CMakeLists.txt +++ b/tests/auto/qmltest/objectmodel/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(objectmodel PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:objectmodel.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/pathview/CMakeLists.txt b/tests/auto/qmltest/pathview/CMakeLists.txt index 2aaca0d60b..d287ff663c 100644 --- a/tests/auto/qmltest/pathview/CMakeLists.txt +++ b/tests/auto/qmltest/pathview/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(pathview PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:pathview.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/pixel/CMakeLists.txt b/tests/auto/qmltest/pixel/CMakeLists.txt index 6aae4e0e0b..66542b0bba 100644 --- a/tests/auto/qmltest/pixel/CMakeLists.txt +++ b/tests/auto/qmltest/pixel/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(pixel PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:pixel.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/positioners/CMakeLists.txt b/tests/auto/qmltest/positioners/CMakeLists.txt index 79954b0dfa..e1ddbe8f3c 100644 --- a/tests/auto/qmltest/positioners/CMakeLists.txt +++ b/tests/auto/qmltest/positioners/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(positioners PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:positioners.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt index bb43ee20ef..0df865467b 100644 --- a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(qqmlbinding PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:qqmlbinding.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/qtbug46798/CMakeLists.txt b/tests/auto/qmltest/qtbug46798/CMakeLists.txt index 31c1f20f62..f614f0adee 100644 --- a/tests/auto/qmltest/qtbug46798/CMakeLists.txt +++ b/tests/auto/qmltest/qtbug46798/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(qtbug46798 PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:qtbug46798.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/rectangle/CMakeLists.txt b/tests/auto/qmltest/rectangle/CMakeLists.txt index 5491359758..df432f08c7 100644 --- a/tests/auto/qmltest/rectangle/CMakeLists.txt +++ b/tests/auto/qmltest/rectangle/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(rectangle PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:rectangle.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/selftests/CMakeLists.txt b/tests/auto/qmltest/selftests/CMakeLists.txt index e49951e9d9..7c2cbbfccc 100644 --- a/tests/auto/qmltest/selftests/CMakeLists.txt +++ b/tests/auto/qmltest/selftests/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(selftests PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:selftests.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/shadersource/CMakeLists.txt b/tests/auto/qmltest/shadersource/CMakeLists.txt index a9178a0931..7f048f59be 100644 --- a/tests/auto/qmltest/shadersource/CMakeLists.txt +++ b/tests/auto/qmltest/shadersource/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(shadersource PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:shadersource.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/stability/CMakeLists.txt b/tests/auto/qmltest/stability/CMakeLists.txt index cc2434f305..3f3874b4d1 100644 --- a/tests/auto/qmltest/stability/CMakeLists.txt +++ b/tests/auto/qmltest/stability/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(stability PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:stability.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/statemachine/CMakeLists.txt b/tests/auto/qmltest/statemachine/CMakeLists.txt index 6d587323e9..604684952a 100644 --- a/tests/auto/qmltest/statemachine/CMakeLists.txt +++ b/tests/auto/qmltest/statemachine/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(statemachine PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/text/CMakeLists.txt b/tests/auto/qmltest/text/CMakeLists.txt index b369f3f166..d1c1e84d00 100644 --- a/tests/auto/qmltest/text/CMakeLists.txt +++ b/tests/auto/qmltest/text/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(text PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:text.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/textedit/CMakeLists.txt b/tests/auto/qmltest/textedit/CMakeLists.txt index e6c6cbb864..c3027d6f66 100644 --- a/tests/auto/qmltest/textedit/CMakeLists.txt +++ b/tests/auto/qmltest/textedit/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(textedit PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:textedit.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/textinput/CMakeLists.txt b/tests/auto/qmltest/textinput/CMakeLists.txt index 009173afad..ff1b3b5654 100644 --- a/tests/auto/qmltest/textinput/CMakeLists.txt +++ b/tests/auto/qmltest/textinput/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(textinput PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:textinput.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/qmltest/window/CMakeLists.txt b/tests/auto/qmltest/window/CMakeLists.txt index d9ec6cab26..dfd262ab27 100644 --- a/tests/auto/qmltest/window/CMakeLists.txt +++ b/tests/auto/qmltest/window/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(window PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:window.pro:<TRUE>: -# CONFIG = "qmltestcase" diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt index ab0be47cfa..168d2b918e 100644 --- a/tests/auto/quick/drawingmodes/CMakeLists.txt +++ b/tests/auto/quick/drawingmodes/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_drawingmodes - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_drawingmodes.cpp @@ -29,15 +26,11 @@ add_qt_test(tst_drawingmodes ) #### Keys ignored in scope 1:.:.:drawingmodes.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" # OTHER_FILES = "data/DrawingModes.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:drawingmodes.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index f8526b8dc7..339b72dbe3 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_examples - GUI SOURCES tst_examples.cpp DEFINES @@ -22,11 +21,7 @@ add_qt_test(tst_examples ) #### Keys ignored in scope 1:.:.:examples.pro:<TRUE>: -# CONFIG = "testcase" # testcase.timeout = "400" ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:examples.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt index 006b5529b7..c017ffc3d5 100644 --- a/tests/auto/quick/geometry/CMakeLists.txt +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_geometry - GUI SOURCES tst_geometry.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_geometry Qt::Quick ) -#### Keys ignored in scope 1:.:.:geometry.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:geometry.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt index 734480abe3..a971539c63 100644 --- a/tests/auto/quick/nodes/CMakeLists.txt +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_nodestest - GUI SOURCES tst_nodestest.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_nodestest Qt::Quick ) -#### Keys ignored in scope 1:.:.:nodes.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:nodes.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt index 4295eb996c..78e1604b12 100644 --- a/tests/auto/quick/nokeywords/CMakeLists.txt +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_nokeywords - GUI SOURCES tst_nokeywords.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_nokeywords Qt::Quick ) -#### Keys ignored in scope 1:.:.:nokeywords.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:nokeywords.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt index f45173d469..ef495e7844 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_flickableinterop - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_flickableinterop ) #### Keys ignored in scope 1:.:.:flickableinterop.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/flickableWithHandlers.qml" "data/Slider.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:flickableinterop.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt index e65638f6d5..a6ff5adab4 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_multipointtoucharea_interop - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_multipointtoucharea_interop ) #### Keys ignored in scope 1:.:.:multipointtoucharea_interop.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/pinchDragMPTA.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:multipointtoucharea_interop.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt index fdd71ce558..2db5a70c03 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickdraghandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickdraghandler ) #### Keys ignored in scope 1:.:.:qquickdraghandler.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/DragAnywhereSlider.qml" "data/FlashAnimation.qml" "data/Slider.qml" "data/draggables.qml" "data/grabberstate.qml" "data/multipleSliders.qml" "data/reparenting.qml" "data/snapMode.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickdraghandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt index 0305faf119..b7e2983b73 100644 --- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickhoverhandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickhoverhandler ) #### Keys ignored in scope 1:.:.:qquickhoverhandler.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/lesHoverables.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickhoverhandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt index c00d7af096..edcc3cd7c3 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpinchhandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickpinchhandler ) #### Keys ignored in scope 1:.:.:qquickpinchhandler.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/pinchproperties.qml" "data/threeFingers.qml" "data/transformedPinchArea.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpinchhandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt index 7650009e5e..d05c3067d3 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpointerhandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickpointerhandler TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpointerhandler.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpointerhandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt index ec05ce058e..5db27144bf 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpointhandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickpointhandler ) #### Keys ignored in scope 1:.:.:qquickpointhandler.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/pointTracker.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpointhandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt index f80bb5400b..c57a77725e 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktaphandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquicktaphandler TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktaphandler.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktaphandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt index beee5e2c7a..222c985ce7 100644 --- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickwheelhandler - GUI SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickwheelhandler ) #### Keys ignored in scope 1:.:.:qquickwheelhandler.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/rectWheel.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickwheelhandler.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt index f1682f6f0b..6eacc6e68b 100644 --- a/tests/auto/quick/propertyrequirements/CMakeLists.txt +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_propertyrequirements - GUI SOURCES tst_propertyrequirements.cpp LIBRARIES @@ -15,11 +14,5 @@ add_qt_test(tst_propertyrequirements Qt::Qml ) -#### Keys ignored in scope 1:.:.:propertyrequirements.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:propertyrequirements.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt index 5ad7f7df61..b2379be093 100644 --- a/tests/auto/quick/qquickaccessible/CMakeLists.txt +++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickaccessible - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickaccessible.cpp @@ -33,15 +30,11 @@ add_qt_test(tst_qquickaccessible ) #### Keys ignored in scope 1:.:.:qquickaccessible.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/checkbuttons.qml" "data/hittest.qml" "data/pushbutton.qml" "data/statictext.qml" "data/ignored.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickaccessible.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt index 1593de24d8..35a72c411e 100644 --- a/tests/auto/quick/qquickanchors/CMakeLists.txt +++ b/tests/auto/quick/qquickanchors/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickanchors - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickanchors TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickanchors.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickanchors.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt index 7032f478ab..cb9c578b6a 100644 --- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickanimatedimage - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -33,15 +30,9 @@ add_qt_test(tst_qquickanimatedimage TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickanimatedimage.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickanimatedimage.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt index e03b7c1810..fe7ad609e0 100644 --- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickanimatedsprite - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimatedsprite.cpp @@ -34,15 +31,11 @@ add_qt_test(tst_qquickanimatedsprite ) #### Keys ignored in scope 1:.:.:qquickanimatedsprite.pro:<TRUE>: -# CONFIG = "testcase" -# OTHER_FILES = "$$filesdata/*.qml" +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickanimatedsprite.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt index 41dc23283e..e0ac399cd4 100644 --- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt +++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickanimationcontroller @@ -28,5 +26,4 @@ add_qt_test(tst_qquickanimationcontroller ) #### Keys ignored in scope 1:.:.:qquickanimationcontroller.pro:<TRUE>: -# CONFIG = "qmltestcase" # TEMPLATE = "app" diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt index 6400a6b966..6a2541a247 100644 --- a/tests/auto/quick/qquickanimations/CMakeLists.txt +++ b/tests/auto/quick/qquickanimations/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickanimations - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimations.cpp @@ -36,15 +33,11 @@ add_qt_test(tst_qquickanimations ) #### Keys ignored in scope 1:.:.:qquickanimations.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickanimations.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt index eeb0d00634..428073f0dc 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickanimators - GUI SOURCES tst_qquickanimators.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_qquickanimators Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickanimators.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickanimators.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt index 0fe704c8f5..a7a2f4157d 100644 --- a/tests/auto/quick/qquickapplication/CMakeLists.txt +++ b/tests/auto/quick/qquickapplication/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickapplication - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickapplication.cpp @@ -32,15 +29,11 @@ add_qt_test(tst_qquickapplication ) #### Keys ignored in scope 1:.:.:qquickapplication.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/tst_displayname.qml" "data/tst_platformname.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickapplication.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt index b9bb0d0bba..5894ac2774 100644 --- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickbehaviors - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickbehaviors.cpp @@ -32,15 +29,11 @@ add_qt_test(tst_qquickbehaviors ) #### Keys ignored in scope 1:.:.:qquickbehaviors.pro:<TRUE>: -# CONFIG = "testcase" -# DISTFILES = "$$filesdata/*" +# DISTFILES = "data/*" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickbehaviors.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt index 8a675c1bb6..07fe7a1339 100644 --- a/tests/auto/quick/qquickborderimage/CMakeLists.txt +++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickborderimage - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,15 +35,9 @@ add_qt_test(tst_qquickborderimage TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickborderimage.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickborderimage.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt index eedcb1b8c7..b695355359 100644 --- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt +++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickcanvasitem @@ -28,7 +26,6 @@ add_qt_test(tst_qquickcanvasitem ) #### Keys ignored in scope 1:.:.:qquickcanvasitem.pro:<TRUE>: -# CONFIG = "qmltestcase" "insignificant_test" # OTHER_FILES = "data/tst_transform.qml" "data/tst_text.qml" "data/tst_strokeStyle.qml" "data/tst_state.qml" "data/tst_shadow.qml" "data/tst_pattern.qml" "data/tst_path.qml" "data/tst_line.qml" "data/tst_fillStyle.qml" "data/tst_fillrect.qml" "data/tst_composite.qml" "data/tst_canvas.qml" "data/tst_pixel.qml" "data/tst_gradient.qml" "data/tst_arcto.qml" "data/tst_arc.qml" "data/tst_context.qml" "data/tst_imagedata.qml" "data/CanvasTestCase.qml" "data/CanvasComponent.qml" "data/tst_image.qml" "data/tst_svgpath.qml" "data/anim-gr.gif" "data/anim-gr.png" "data/anim-poster-gr.png" "data/background.png" "data/broken.png" "data/ggrr-256x256.png" "data/green-1x1.png" "data/green-2x2.png" "data/green-16x16.png" "data/green-256x256.png" "data/green.png" "data/grgr-256x256.png" "data/red-16x16.png" "data/red.png" "data/redtransparent.png" "data/rgrg-256x256.png" "data/rrgg-256x256.png" "data/transparent.png" "data/transparent50.png" "data/yellow.png" "data/yellow75.png" "data/tst_invalidContext.qml" # TEMPLATE = "app" diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt index 900822ed06..87492ff436 100644 --- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt +++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickdesignersupport - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickdesignersupport ) #### Keys ignored in scope 1:.:.:qquickdesignersupport.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/TestComponent.qml" "data/test.qml" "data/componentTest.qml" "data/Component01.qml" "data/Component02.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickdesignersupport.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt index 379be72636..ad077411c2 100644 --- a/tests/auto/quick/qquickdrag/CMakeLists.txt +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickdrag - GUI SOURCES tst_qquickdrag.cpp LIBRARIES @@ -20,11 +19,5 @@ add_qt_test(tst_qquickdrag Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickdrag.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickdrag.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt index ccac3c9752..f56593b245 100644 --- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickdynamicpropertyanimation - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickdynamicpropertyanimation.cpp @@ -26,15 +23,9 @@ add_qt_test(tst_qquickdynamicpropertyanimation TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickdynamicpropertyanimation.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickdynamicpropertyanimation.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt index 89403c19bd..43ec4cd14d 100644 --- a/tests/auto/quick/qquickflickable/CMakeLists.txt +++ b/tests/auto/quick/qquickflickable/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickflickable - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickflickable TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickflickable.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickflickable.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt index 1ae064806d..42d3e5516e 100644 --- a/tests/auto/quick/qquickflipable/CMakeLists.txt +++ b/tests/auto/quick/qquickflipable/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickflipable - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickflipable.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquickflipable TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickflipable.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickflipable.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt index 9fb29df116..3d13e0b9e0 100644 --- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt +++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfocusscope - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickfocusscope TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickfocusscope.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfocusscope.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt index 38fc6d9814..44dcfdad0a 100644 --- a/tests/auto/quick/qquickfontloader/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfontloader - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -33,15 +30,9 @@ add_qt_test(tst_qquickfontloader TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickfontloader.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfontloader.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt index 47bd55237d..0ddf042334 100644 --- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickfontloader_static - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfontloader_static.cpp @@ -34,15 +31,9 @@ add_qt_test(tst_qquickfontloader_static TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickfontloader_static.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickfontloader_static.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt index b141b4ef8f..6cab5d6550 100644 --- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_quickfontmetrics - GUI SOURCES tst_quickfontmetrics.cpp LIBRARIES @@ -16,11 +15,5 @@ add_qt_test(tst_quickfontmetrics Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickfontmetrics.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickfontmetrics.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt index 32ecd761f0..d58a100884 100644 --- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt +++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickframebufferobject - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickframebufferobject.cpp @@ -26,15 +23,11 @@ add_qt_test(tst_qquickframebufferobject ) #### Keys ignored in scope 1:.:.:qquickframebufferobject.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/testStuff.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickframebufferobject.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt index 111de2b978..6de5162b10 100644 --- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt +++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickgraphicsinfo - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgraphicsinfo.cpp @@ -26,15 +23,11 @@ add_qt_test(tst_qquickgraphicsinfo ) #### Keys ignored in scope 1:.:.:qquickgraphicsinfo.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/basic.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickgraphicsinfo.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt index a9c985920d..885ef9eae4 100644 --- a/tests/auto/quick/qquickgridview/CMakeLists.txt +++ b/tests/auto/quick/qquickgridview/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickgridview - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -40,15 +37,11 @@ add_qt_test(tst_qquickgridview ) #### Keys ignored in scope 1:.:.:qquickgridview.pro:<TRUE>: -# CONFIG = "testcase" # testcase.timeout = "1100" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickgridview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt index 4fcb949ce0..9c519290ce 100644 --- a/tests/auto/quick/qquickimage/CMakeLists.txt +++ b/tests/auto/quick/qquickimage/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickimage - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,15 +35,9 @@ add_qt_test(tst_qquickimage TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickimage.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickimage.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt index 4db2a56630..d81a845a02 100644 --- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickimageprovider - GUI SOURCES tst_qquickimageprovider.cpp LIBRARIES @@ -20,11 +19,5 @@ add_qt_test(tst_qquickimageprovider Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickimageprovider.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickimageprovider.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt index fe9f817b4b..e78d7d7b40 100644 --- a/tests/auto/quick/qquickitem/CMakeLists.txt +++ b/tests/auto/quick/qquickitem/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickitem - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickitem TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickitem.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickitem.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets DEFINES TEST_QTBUG_60123 diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt index 48d0a21a91..1555ad6cef 100644 --- a/tests/auto/quick/qquickitem2/CMakeLists.txt +++ b/tests/auto/quick/qquickitem2/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickitem2 - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitem.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquickitem2 TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickitem2.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickitem2.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt index cb140b92d0..a03a0d3478 100644 --- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt +++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickitemlayer - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemlayer.cpp @@ -32,15 +29,11 @@ add_qt_test(tst_qquickitemlayer ) #### Keys ignored in scope 1:.:.:qquickitemlayer.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/Smooth.qml" "data/Enabled.qml" "data/Mipmap.qml" "data/Effect.qml" "data/SourceRect.qml" "data/TextureProvider.qml" "data/Visible.qml" "data/ZOrder.qml" "data/ZOrderChange.qml" "data/ToggleLayerAndEffect.qml" "data/DisableLayer.qml" "data/SamplerNameChange.qml" "data/ItemEffect.qml" "data/RectangleEffect.qml" "data/TextureMirroring.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickitemlayer.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt index e37f376d43..1c515786a2 100644 --- a/tests/auto/quick/qquicklayouts/CMakeLists.txt +++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicklayouts @@ -28,6 +26,5 @@ add_qt_test(tst_qquicklayouts ) #### Keys ignored in scope 1:.:.:qquicklayouts.pro:<TRUE>: -# CONFIG = "qmltestcase" # OTHER_FILES = "data/tst_rowlayout.qml" "data/tst_gridlayout.qml" "data/tst_stacklayout.qml" # TEMPLATE = "app" diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index 6c70160aac..7c809d8c29 100644 --- a/tests/auto/quick/qquicklistview/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicklistview - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -43,16 +40,12 @@ add_qt_test(tst_qquicklistview ) #### Keys ignored in scope 1:.:.:qquicklistview.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/*" # testcase.timeout = "900" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicklistview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt index 73125de827..a92ea61df5 100644 --- a/tests/auto/quick/qquickloader/CMakeLists.txt +++ b/tests/auto/quick/qquickloader/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickloader - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,15 +35,9 @@ add_qt_test(tst_qquickloader TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickloader.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickloader.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt index dac995f721..bb60a32d8b 100644 --- a/tests/auto/quick/qquickmousearea/CMakeLists.txt +++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickmousearea - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -39,15 +36,11 @@ add_qt_test(tst_qquickmousearea ) #### Keys ignored in scope 1:.:.:qquickmousearea.pro:<TRUE>: -# CONFIG = "testcase" -# OTHER_FILES = "$$filesdata/*.qml" +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickmousearea.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt index 4f7b5b9c99..bb3ae58ab3 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt +++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickmultipointtoucharea - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickmultipointtoucharea TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickmultipointtoucharea.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickmultipointtoucharea.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt index a35670be38..bf366c2b7c 100644 --- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt +++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickopenglinfo - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickopenglinfo.cpp @@ -26,15 +23,11 @@ add_qt_test(tst_qquickopenglinfo ) #### Keys ignored in scope 1:.:.:qquickopenglinfo.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/basic.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickopenglinfo.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt index 09c480b9f6..fd528006b0 100644 --- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickpainteditem - GUI SOURCES tst_qquickpainteditem.cpp LIBRARIES @@ -20,11 +19,5 @@ add_qt_test(tst_qquickpainteditem Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickpainteditem.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickpainteditem.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt index 2338df87fa..cf7d7740ac 100644 --- a/tests/auto/quick/qquickpath/CMakeLists.txt +++ b/tests/auto/quick/qquickpath/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpath - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpath.cpp @@ -32,15 +29,11 @@ add_qt_test(tst_qquickpath ) #### Keys ignored in scope 1:.:.:qquickpath.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/*" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpath.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt index dfb7a8cc54..a9b2bfb1af 100644 --- a/tests/auto/quick/qquickpathview/CMakeLists.txt +++ b/tests/auto/quick/qquickpathview/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpathview - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,15 +36,9 @@ add_qt_test(tst_qquickpathview TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpathview.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpathview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt index ca35da6eaf..07a3768684 100644 --- a/tests/auto/quick/qquickpincharea/CMakeLists.txt +++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpincharea - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickpincharea TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpincharea.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpincharea.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt index 5dc5bd71ab..7064dc9ce5 100644 --- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt +++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpixmapcache - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -34,15 +31,9 @@ add_qt_test(tst_qquickpixmapcache TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpixmapcache.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpixmapcache.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt index a01fd45328..3a5aa6aa5f 100644 --- a/tests/auto/quick/qquickpositioners/CMakeLists.txt +++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickpositioners - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,15 +34,9 @@ add_qt_test(tst_qquickpositioners TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickpositioners.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickpositioners.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt index 8186d01e61..5653c08dd3 100644 --- a/tests/auto/quick/qquickrectangle/CMakeLists.txt +++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickrectangle - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickrectangle TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickrectangle.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickrectangle.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt index db9ff124c3..5863de83ef 100644 --- a/tests/auto/quick/qquickrepeater/CMakeLists.txt +++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickrepeater - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,15 +35,9 @@ add_qt_test(tst_qquickrepeater TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickrepeater.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickrepeater.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt index ccd5e04513..c53ed38d28 100644 --- a/tests/auto/quick/qquickscreen/CMakeLists.txt +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickscreen - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickscreen.cpp @@ -22,15 +21,9 @@ add_qt_test(tst_qquickscreen Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickscreen.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickscreen.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt index 50afc961b7..11b63af453 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickshadereffect - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshadereffect.cpp @@ -22,15 +21,9 @@ add_qt_test(tst_qquickshadereffect Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickshadereffect.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickshadereffect.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt index 2e74f493fa..4e31680f7f 100644 --- a/tests/auto/quick/qquickshape/CMakeLists.txt +++ b/tests/auto/quick/qquickshape/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickshape - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,15 +36,11 @@ add_qt_test(tst_qquickshape ) #### Keys ignored in scope 1:.:.:qquickshape.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/*" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickshape.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt index f5f4ef9590..42b69b9587 100644 --- a/tests/auto/quick/qquickshortcut/CMakeLists.txt +++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickshortcut - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshortcut.cpp @@ -26,9 +23,6 @@ add_qt_test(tst_qquickshortcut TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickshortcut.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt index 7cfa0a3fb8..837160e69b 100644 --- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt +++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicksmoothedanimation - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicksmoothedanimation.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquicksmoothedanimation TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicksmoothedanimation.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicksmoothedanimation.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt index bfee6d380c..85b53abf9a 100644 --- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickspringanimation - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspringanimation.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquickspringanimation TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickspringanimation.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickspringanimation.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt index a415757072..f40680742a 100644 --- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt +++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickspritesequence - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritesequence.cpp @@ -32,15 +29,9 @@ add_qt_test(tst_qquickspritesequence TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickspritesequence.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickspritesequence.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt index 38a026fb05..7494cfb97f 100644 --- a/tests/auto/quick/qquickstates/CMakeLists.txt +++ b/tests/auto/quick/qquickstates/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickstates - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickstates.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquickstates TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickstates.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickstates.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt index 360e910bd7..0d0808969a 100644 --- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquickstyledtext - GUI SOURCES tst_qquickstyledtext.cpp LIBRARIES @@ -20,11 +19,5 @@ add_qt_test(tst_qquickstyledtext Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquickstyledtext.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquickstyledtext.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt index 20f4186cef..53287a6d0c 100644 --- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquicksystempalette - GUI SOURCES tst_qquicksystempalette.cpp LIBRARIES @@ -19,15 +18,9 @@ add_qt_test(tst_qquicksystempalette Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquicksystempalette.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicksystempalette.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - 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 76001f9b84..773a166473 100644 --- a/tests/auto/quick/qquicktableview/CMakeLists.txt +++ b/tests/auto/quick/qquicktableview/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktableview - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -40,15 +37,9 @@ add_qt_test(tst_qquicktableview TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktableview.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktableview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt index c0c52eab6b..7148567a25 100644 --- a/tests/auto/quick/qquicktext/CMakeLists.txt +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktext - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -34,15 +31,9 @@ add_qt_test(tst_qquicktext TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktext.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktext.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt index 5ae5ef9154..5b23371191 100644 --- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt +++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktextdocument - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktextdocument.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qquicktextdocument TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktextdocument.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquicktextdocument.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt index d87505d35f..cc244983b0 100644 --- a/tests/auto/quick/qquicktextedit/CMakeLists.txt +++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktextedit - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -39,9 +36,6 @@ add_qt_test(tst_qquicktextedit TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktextedit.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### @@ -50,9 +44,6 @@ extend_target(tst_qquicktextedit CONDITION APPLE_OSX ${FWAppKit} ) -#### Keys ignored in scope 2:.:.:qquicktextedit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt index ac914291da..0901c29b21 100644 --- a/tests/auto/quick/qquicktextinput/CMakeLists.txt +++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquicktextinput - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -32,9 +29,6 @@ add_qt_test(tst_qquicktextinput TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquicktextinput.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### @@ -43,9 +37,6 @@ extend_target(tst_qquicktextinput CONDITION APPLE_OSX ${FWAppKit} ) -#### Keys ignored in scope 2:.:.:qquicktextinput.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt index 508657b370..0fbb74e0a8 100644 --- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquicktextmetrics - GUI SOURCES tst_qquicktextmetrics.cpp LIBRARIES @@ -16,11 +15,5 @@ add_qt_test(tst_qquicktextmetrics Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquicktextmetrics.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquicktextmetrics.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt index d303e7a462..40e926dd0d 100644 --- a/tests/auto/quick/qquicktimeline/CMakeLists.txt +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qquicktimeline - GUI SOURCES tst_qquicktimeline.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_qquicktimeline Qt::Quick ) -#### Keys ignored in scope 1:.:.:qquicktimeline.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qquicktimeline.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt index 09aea1d0a3..c7cf57a66a 100644 --- a/tests/auto/quick/qquickview/CMakeLists.txt +++ b/tests/auto/quick/qquickview/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickview - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickview TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickview.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickview.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt index db173d0d3e..f9d4d96473 100644 --- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt +++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickvisualdatamodel - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,15 +35,9 @@ add_qt_test(tst_qquickvisualdatamodel TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickvisualdatamodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickvisualdatamodel.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt index 390fa0c154..8d119952f7 100644 --- a/tests/auto/quick/qquickwindow/CMakeLists.txt +++ b/tests/auto/quick/qquickwindow/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickwindow - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,15 +34,11 @@ add_qt_test(tst_qquickwindow ) #### Keys ignored in scope 1:.:.:qquickwindow.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/active.qml" "data/AnimationsWhileHidden.qml" "data/Headless.qml" "data/showHideAnimate.qml" "data/windoworder.qml" "data/grabContentItemToImage.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickwindow.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt index 2cbc4fdc66..7116c65a6c 100644 --- a/tests/auto/quick/rendernode/CMakeLists.txt +++ b/tests/auto/quick/rendernode/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_rendernode - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_rendernode.cpp @@ -32,15 +29,11 @@ add_qt_test(tst_rendernode ) #### Keys ignored in scope 1:.:.:rendernode.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/RenderOrder.qml" "data/MessUpState.qml" "data/matrix.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:rendernode.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt index a635944e60..e36a2b6720 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_scenegraph - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -28,15 +27,11 @@ add_qt_test(tst_scenegraph ) #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "data/render_OutOfFloatRange.qml" "data/simple.qml" "data/render_ImageFiltering.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:scenegraph.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt index 3c400bbef0..41ab25187d 100644 --- a/tests/auto/quick/sharedimage/CMakeLists.txt +++ b/tests/auto/quick/sharedimage/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_sharedimage - GUI SOURCES tst_sharedimage.cpp LIBRARIES @@ -25,5 +22,4 @@ add_qt_test(tst_sharedimage ) #### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>: -# CONFIG = "testcase" "-app_bundle" # OTHER_FILES = "data/yellow.png" diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt index bc5f2cdd67..5b1c02b0e5 100644 --- a/tests/auto/quick/touchmouse/CMakeLists.txt +++ b/tests/auto/quick/touchmouse/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_touchmouse - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_touchmouse TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:touchmouse.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:touchmouse.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt index 8960319efd..d6e97809bd 100644 --- a/tests/auto/quicktest/polish-qml/CMakeLists.txt +++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml") + ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_polish-qml - GUI QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -28,15 +25,9 @@ add_qt_test(tst_polish-qml TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:polish-qml.pro:<TRUE>: -# CONFIG = "qmltestcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:polish-qml.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt index 666d38352b..d55bd789b9 100644 --- a/tests/auto/quicktest/polish/CMakeLists.txt +++ b/tests/auto/quicktest/polish/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml") + ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_polish - GUI QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -28,15 +25,9 @@ add_qt_test(tst_polish TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:polish.pro:<TRUE>: -# CONFIG = "qmltestcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:polish.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt index e65654b4be..ebd9130394 100644 --- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt +++ b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml") + ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_quicktestmainwithsetup - GUI QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -26,15 +23,9 @@ add_qt_test(tst_quicktestmainwithsetup TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:quicktestmainwithsetup.pro:<TRUE>: -# CONFIG = "qmltestcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:quicktestmainwithsetup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt index 20731a6fc4..ae4e3e7b48 100644 --- a/tests/auto/quicktest/signalspy/CMakeLists.txt +++ b/tests/auto/quicktest/signalspy/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_signalspy - GUI SOURCES ../../shared/util.cpp ../../shared/util.h mypropertymap.cpp mypropertymap.h @@ -17,15 +16,9 @@ add_qt_test(tst_signalspy Qt::Quick ) -#### Keys ignored in scope 1:.:.:signalspy.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:signalspy.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt index ff1f91ab58..b27c8b6dc4 100644 --- a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt @@ -5,16 +5,15 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_SOURCE_DIR}/*.qml") + ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) list(APPEND test_data ${test_data_glob}) add_qt_test(quicktestmain GUI QMLTEST + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES quicktestmain.cpp DEFINES @@ -24,11 +23,5 @@ add_qt_test(quicktestmain TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:quicktestmain.pro:<TRUE>: -# CONFIG = "qmltestcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:quicktestmain.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt index 7771c3a41a..194e8fe4b7 100644 --- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt @@ -1,16 +1,12 @@ # Generated from test.pro. ##################################################################### -## ../tst_testfiltering Test: +## tst_testfiltering Test: ##################################################################### add_qt_test(tst_testfiltering - GUI SOURCES ../tst_testfiltering.cpp PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# CONFIG = "testcase" diff --git a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt index d59c38ebfe..c8ec734b4a 100644 --- a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt +++ b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qquickwidget - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickwidget.cpp @@ -36,15 +33,11 @@ add_qt_test(tst_qquickwidget ) #### Keys ignored in scope 1:.:.:qquickwidget.pro:<TRUE>: -# CONFIG = "testcase" # OTHER_FILES = "animating.qml" "error1.qml" "rectangle.qml" "resizemodeitem.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickwidget.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickwidget CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/toolsupport/CMakeLists.txt b/tests/auto/toolsupport/CMakeLists.txt index ee9a984a80..929201afdb 100644 --- a/tests/auto/toolsupport/CMakeLists.txt +++ b/tests/auto/toolsupport/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_toolsupport - GUI SOURCES tst_toolsupport.cpp LIBRARIES @@ -14,6 +13,3 @@ add_qt_test(tst_toolsupport PUBLIC_LIBRARIES Qt::Qml ) - -#### Keys ignored in scope 1:.:.:toolsupport.pro:<TRUE>: -# CONFIG = "testcase" |