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/quicktest | |
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/quicktest')
7 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt index 56038660d9..ff09b1e82e 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}) -qt_add_test(tst_polish-qml +qt_internal_add_test(tst_polish-qml QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -27,12 +27,12 @@ qt_add_test(tst_polish-qml ## Scopes: ##################################################################### -qt_extend_target(tst_polish-qml CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_polish-qml CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT 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 9c5104400c..d980935c88 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}) -qt_add_test(tst_polish +qt_internal_add_test(tst_polish QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -27,12 +27,12 @@ qt_add_test(tst_polish ## Scopes: ##################################################################### -qt_extend_target(tst_polish CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_polish CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_polish CONDITION NOT ANDROID AND NOT 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 252c1011af..9d627dbe43 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}) -qt_add_test(tst_quicktestmainwithsetup +qt_internal_add_test(tst_quicktestmainwithsetup QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -26,12 +26,12 @@ qt_add_test(tst_quicktestmainwithsetup ## Scopes: ##################################################################### -qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT 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 8d9d864ec1..cda19b605a 100644 --- a/tests/auto/quicktest/signalspy/CMakeLists.txt +++ b/tests/auto/quicktest/signalspy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_signalspy Test: ##################################################################### -qt_add_test(tst_signalspy +qt_internal_add_test(tst_signalspy SOURCES ../../shared/util.cpp ../../shared/util.h mypropertymap.cpp mypropertymap.h @@ -19,12 +19,12 @@ qt_add_test(tst_signalspy ## Scopes: ##################################################################### -qt_extend_target(tst_signalspy CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_signalspy CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT 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 9baedbab97..298033084a 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}) -qt_add_test(quicktestmain +qt_internal_add_test(quicktestmain GUI QMLTEST OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" diff --git a/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt index f00249bfc4..07c019829a 100644 --- a/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_testfiltering Test: ##################################################################### -qt_add_test(tst_testfiltering +qt_internal_add_test(tst_testfiltering OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_testfiltering.cpp diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt index b53bfec73b..448bf1bf60 100644 --- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_testfiltering Test: ##################################################################### -qt_add_test(tst_testfiltering +qt_internal_add_test(tst_testfiltering OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES |