diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:33:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:42 +0000 |
| commit | 30917cd20ce1e40482e967fdafb5f8b95a62b640 (patch) | |
| tree | 090589f0c9984fc5a0715844fdfa7b993551bab6 /tests/auto/quick/qquickdroparea | |
| parent | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (diff) | |
Regenerate required projects after dev -> wip/cmake merge
Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickdroparea')
| -rw-r--r-- | tests/auto/quick/qquickdroparea/CMakeLists.txt | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index 083a08cf10..ea66f99c0c 100644 --- a/tests/auto/quick/qquickdroparea/CMakeLists.txt +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -4,10 +4,23 @@ ## tst_qquickdroparea Test: ##################################################################### +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + add_qt_test(tst_qquickdroparea - GUI SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickdroparea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared LIBRARIES Qt::CorePrivate Qt::GuiPrivate @@ -18,13 +31,21 @@ add_qt_test(tst_qquickdroparea Qt::Network Qt::Qml Qt::Quick + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:qquickdroparea.pro:<TRUE>: -# CONFIG = "testcase" +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickdroparea.pro:APPLE_OSX: -# CONFIG = "-app_bundle" +extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) |