diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Gui Svg QuickControls2) if (BUILD_TESTING) - find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) + find_package(Qt5QuickTest ${REQUIRED_QT_VERSION} CONFIG QUIET) endif() add_definitions(-DQT_NO_FOREACH) set(CMAKE_AUTOMOC ON) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,12 +1,22 @@ -if(NOT Qt5Test_FOUND) - message(STATUS "Qt5Test not found, autotests will not be built.") +if(NOT Qt5QuickTest_FOUND) + message(STATUS "Qt5QuickTest not found, autotests will not be built.") return() endif() +add_executable(qmltest qmltest.cpp) +target_link_libraries(qmltest Qt5::QuickTest) + macro(kirigami_add_tests) + if (WIN32) + set(_extra_args -platform offscreen) + endif() + foreach(test ${ARGV}) add_test(NAME ${test} - COMMAND qmltestrunner -import ${CMAKE_BINARY_DIR}/bin -input ${test} + COMMAND qmltest + ${_extra_args} + -import ${CMAKE_BINARY_DIR}/bin + -input ${test} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) endforeach() diff --git a/autotests/qmltest.cpp b/autotests/qmltest.cpp new file mode 100644 --- /dev/null +++ b/autotests/qmltest.cpp @@ -0,0 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2020 Arjen Hiemstra + * + * SPDX-License-Identifier: LGPL-2.0-or-later + */ + +#include +QUICK_TEST_MAIN(Kirigami)