diff options
Diffstat (limited to 'tests/auto/qml/debugger')
22 files changed, 83 insertions, 143 deletions
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" |