8c2a95dbe2
* Mir starts up and is able to display system settings
* x86_64 only for now, because at least ubuntu-app-test did not build
on aarch64
Based on PureTryOut's work. Getting it to this stage was a huge effort
(as it shows in the package count: 111(!)). See the merge request for
details.
[skip ci]: this won't finish in CI; ollieparanoid made sure that
everything builds for x86_64.
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff --git a/cmake/modules/QmlTest.cmake b/cmake/modules/QmlTest.cmake
|
|
index 42d5c49..3ccd6ac 100644
|
|
--- a/cmake/modules/QmlTest.cmake
|
|
+++ b/cmake/modules/QmlTest.cmake
|
|
@@ -65,9 +65,9 @@ endfunction()
|
|
# This function wraps add_executable_test, see below for available arguments.
|
|
|
|
function(add_qml_unittest PATH COMPONENT_NAME)
|
|
- import_executables(qmltestrunner)
|
|
+ import_executables(qmltestrunner-qt5)
|
|
|
|
- add_executable_test(${COMPONENT_NAME} qmltestrunner
|
|
+ add_executable_test(${COMPONENT_NAME} qmltestrunner-qt5
|
|
${ARGN}
|
|
ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
|
|
)
|
|
@@ -84,10 +84,10 @@ endfunction()
|
|
# This function wraps add_manual_test, see below for available arguments.
|
|
|
|
function(add_manual_qml_test PATH COMPONENT_NAME)
|
|
- import_executables(qmlscene)
|
|
+ import_executables(qmlscene-qt5)
|
|
cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
|
|
|
|
- add_manual_test(${COMPONENT_NAME} qmlscene
|
|
+ add_manual_test(${COMPONENT_NAME} qmlscene-qt5
|
|
${ARGN}
|
|
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
|
|
)
|