diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 11:39:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:38 +0000 |
| commit | 91e32f86b53bb930405a58e19c84746ee85cdf89 (patch) | |
| tree | 3419986b62355e718551b83a514c1169480a8ed0 /tests/auto/qml/qqmltranslation | |
| parent | 387f360b3b2634094889478f2b258e65a70b9aa6 (diff) | |
Regenerate remaining tests to be in sync
Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmltranslation')
| -rw-r--r-- | tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt | 56 | ||||
| -rw-r--r-- | tests/auto/qml/qqmltranslation/CMakeLists.txt | 22 |
2 files changed, 65 insertions, 13 deletions
diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt new file mode 100644 index 0000000000..968b04f6ae --- /dev/null +++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt @@ -0,0 +1,56 @@ +# Generated from qqmltranslation.pro. + +##################################################################### +## tst_qqmltranslation 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_qqmltranslation + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qqmltranslation.cpp + INCLUDE_DIRECTORIES + ../../shared + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + TESTDATA ${test_data} +) + +# Resources: +set(translation_resource_files + "qml_fr.qm" + "translation.qml" +) + +add_qt_resource(tst_qqmltranslation "translation" + PREFIX + "/" + BASE + "data" + FILES + ${translation_resource_files} +) + + +## Scopes: +##################################################################### + +extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt index 8d96732e1f..e6488e42dc 100644 --- a/tests/auto/qml/qqmltranslation/CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/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_qqmltranslation - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltranslation.cpp @@ -30,6 +27,11 @@ add_qt_test(tst_qqmltranslation ) # Resources: +set(translation_resource_files + "qml_fr.qm" + "translation.qml" +) + # special case begin set_source_files_properties( data/translation.qml @@ -43,26 +45,20 @@ set_source_files_properties( QT_RESOURCE_ALIAS qml_fr.qm ) # special case end + add_qt_resource(tst_qqmltranslation "translation" PREFIX "/" BASE "data" FILES - qml_fr.qm - translation.qml + ${translation_resource_files} ) -#### Keys ignored in scope 1:.:.:qqmltranslation.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmltranslation.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" |