diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-18 18:24:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-25 09:46:41 +0000 |
| commit | 3c3d168487b10e7e4d7c06df5a28df9d4220b6de (patch) | |
| tree | 5279adb0525f23d077e99c8af1503e22e96d0864 /tests | |
| parent | 902dfced06b73b92ae6cb9adc7a51acff0bcc936 (diff) | |
| download | qtwebchannel-wip/cmake.tar.gz | |
Regenerate projectswip/cmake
Change-Id: Ibdadef34b1b7d4ea98140feed171c409eb8bafde
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/webchannel/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index e49bd8c..3b6013f 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -5,14 +5,12 @@ ##################################################################### # Collect test data - file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(qml - GUI +qt_add_test(qml QMLTEST QML_IMPORTPATH "${CMAKE_CURRENT_BINARY_DIR}/../../../qml" diff --git a/tests/auto/webchannel/CMakeLists.txt b/tests/auto/webchannel/CMakeLists.txt index aa040f8..1f7d734 100644 --- a/tests/auto/webchannel/CMakeLists.txt +++ b/tests/auto/webchannel/CMakeLists.txt @@ -4,8 +4,7 @@ ## tst_webchannel Test: ##################################################################### -add_qt_test(tst_webchannel - GUI +qt_add_test(tst_webchannel SOURCES tst_webchannel.cpp tst_webchannel.h INCLUDE_DIRECTORIES @@ -20,7 +19,7 @@ add_qt_test(tst_webchannel ## Scopes: ##################################################################### -extend_target(tst_webchannel CONDITION TARGET Qt::Qml +qt_extend_target(tst_webchannel CONDITION TARGET Qt::Qml DEFINES WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE PUBLIC_LIBRARIES |