diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-28 16:42:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 10:01:25 +0200 |
| commit | 350a2f48c15d7766a58f13c9625e32e766ecdf80 (patch) | |
| tree | b6e05e3ae5d8e0db8e06d56df71e877124a00afd /tests/auto/qml/qqmlapplicationengine/CMakeLists.txt | |
| parent | 965984771d1c146a01fbaab3f6dae2461eabf78e (diff) | |
CMake: Regenerate qtdeclarative/tests
Includes:
- new api calls
- some new dependencies
- some TARGET_DESCRIPTION
- some additional tool directory exclusion when cross-compiling
(qmlplugindump)
- some missing add_subdirectory calls
Change-Id: Iea43e45b94f37367ffc1d8dd6ce0ff1021a31b1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine/CMakeLists.txt')
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index cecbcba683..695651f90e 100644 --- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qqmlapplicationengine +qt_add_test(tst_qqmlapplicationengine SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlapplicationengine.cpp @@ -30,7 +30,7 @@ set(tst_qqmlapplicationengine_resource_files "data/loadTranslation.qml" ) -add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" +qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES @@ -44,12 +44,12 @@ add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" ## Scopes: ##################################################################### -extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS +qt_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |