diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 15:23:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-06 13:19:37 +0200 |
| commit | 08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch) | |
| tree | 0ae21548926596fb41e7e71c4bb14d1973245bde /tests/auto/qml/qqmlapplicationengine | |
| parent | c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff) | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine')
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index 695651f90e..ea88b6c8e3 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}) -qt_add_test(tst_qqmlapplicationengine +qt_internal_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" ) -qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" +qt_internal_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES @@ -44,12 +44,12 @@ qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt index b97251f0b8..f1b2b43506 100644 --- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt @@ -4,7 +4,7 @@ ## testapp Binary: ##################################################################### -qt_add_executable(testapp +qt_internal_add_executable(testapp OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -21,7 +21,7 @@ set(main_resource_files "immediateQuit.qml" ) -qt_add_resource(testapp "main" +qt_internal_add_resource(testapp "main" PREFIX "/" FILES |