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/qqmlecmascript | |
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/qqmlecmascript')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/qml/qqmlecmascript/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt index a30688cfaa..26b7f2437d 100644 --- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlecmascript +qt_internal_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,7 +35,7 @@ set(qqmlecmascript_resource_files "data/js/include3.js" ) -qt_add_resource(tst_qqmlecmascript "qqmlecmascript" +qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -46,17 +46,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt index bf74b8ccba..5c5bd528ed 100644 --- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlecmascript +qt_internal_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -42,7 +42,7 @@ set_source_files_properties( QT_SKIP_QUICKCOMPILER 1) # special case end -qt_add_resource(tst_qqmlecmascript "qqmlecmascript" +qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -53,17 +53,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |