diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 13:31:06 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:51 +0000 |
commit | ba494aaa24defe1401f621b791891e696b308756 (patch) | |
tree | 3617f29e9625fafbf94609ac79b2decd4033107c /tests/auto/qml/qqmlecmascript | |
parent | 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff) |
Regenerate all projects with new CMake API version
Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@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 57e1930778..8c57d85eb7 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}) -add_qt_test(tst_qqmlecmascript +qt_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -37,7 +37,7 @@ set(qqmlecmascript_resource_files "data/js/include3.js" ) -add_qt_resource(tst_qqmlecmascript "qqmlecmascript" +qt_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -48,17 +48,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_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 d467791e87..72ec67ba9f 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}) -add_qt_test(tst_qqmlecmascript +qt_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -44,7 +44,7 @@ set_source_files_properties( QT_SKIP_QUICKCOMPILER 1) # special case end -add_qt_resource(tst_qqmlecmascript "qqmlecmascript" +qt_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -55,17 +55,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |