diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 13:53:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 14:05:23 +0000 |
| commit | 14492ecee2e34843efd3ef070503a43a48552055 (patch) | |
| tree | 37432296f2f6bbc596d2470f79c99ce68801567c /tests/auto/qml/qqmlapplicationengine | |
| parent | 26c5243491f495194f04b449128dae36118e28da (diff) | |
CMake: Regenerate and adapt to merge from devwip/cmake
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine')
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/CMakeLists.txt | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index 9508ebfa9b..c22b7485b6 100644 --- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt @@ -5,51 +5,45 @@ ##################################################################### # 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_qqmlapplicationengine - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlapplicationengine.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) # Resources: +set(tst_qqmlapplicationengine_resource_files + "data/i18n/qml.qm" + "data/loadTranslation.qml" +) + add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES - data/i18n/qml.qm - data/loadTranslation.qml + ${tst_qqmlapplicationengine_resource_files} ) #### Keys ignored in scope 2:.:.:tst_qqmlapplicationengine.pro:<TRUE>: -# CONFIG = "testcase" # TRANSLATIONS = "data/i18n/qml_ja.ts" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qqmlapplicationengine.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" |