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/quicktest | |
| 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/quicktest')
6 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt index d6e97809bd..e870edd415 100644 --- a/tests/auto/quicktest/polish-qml/CMakeLists.txt +++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_polish-qml +qt_add_test(tst_polish-qml QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -28,12 +28,12 @@ add_qt_test(tst_polish-qml ## Scopes: ##################################################################### -extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt index d55bd789b9..ea2bb8818e 100644 --- a/tests/auto/quicktest/polish/CMakeLists.txt +++ b/tests/auto/quicktest/polish/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_polish +qt_add_test(tst_polish QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -28,12 +28,12 @@ add_qt_test(tst_polish ## Scopes: ##################################################################### -extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_polish CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt index ebd9130394..4b10858548 100644 --- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt +++ b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_quicktestmainwithsetup +qt_add_test(tst_quicktestmainwithsetup QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -26,12 +26,12 @@ add_qt_test(tst_quicktestmainwithsetup ## Scopes: ##################################################################### -extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt index ae4e3e7b48..eef90449ff 100644 --- a/tests/auto/quicktest/signalspy/CMakeLists.txt +++ b/tests/auto/quicktest/signalspy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_signalspy Test: ##################################################################### -add_qt_test(tst_signalspy +qt_add_test(tst_signalspy SOURCES ../../shared/util.cpp ../../shared/util.h mypropertymap.cpp mypropertymap.h @@ -19,12 +19,12 @@ add_qt_test(tst_signalspy ## Scopes: ##################################################################### -extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt index b27c8b6dc4..9baedbab97 100644 --- a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) list(APPEND test_data ${test_data_glob}) -add_qt_test(quicktestmain +qt_add_test(quicktestmain GUI QMLTEST OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt index 194e8fe4b7..cfdb53ca89 100644 --- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_testfiltering Test: ##################################################################### -add_qt_test(tst_testfiltering +qt_add_test(tst_testfiltering SOURCES ../tst_testfiltering.cpp PUBLIC_LIBRARIES |