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/auto/qml | |
| 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/auto/qml')
78 files changed, 274 insertions, 674 deletions
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" |