@@ -89,20 +89,20 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
8989 -o -,txt
9090 )
9191 set(qmltest_xvfb_command
92− env ${qmltest_ENVIRONMENT}
93− xvfb-run -l -s "-screen 0 1024x768x24"
92+ env ${qmltest_ENVIRONMENT} LD_PRELOAD=/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1
93+ xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
9494 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
9595 ${qmltestrunner_imports}
9696 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
9797 -o -,txt
9898 )
9999
100− add_qmltest_target(${qmltest_TARGET} "${qmltest_command}")
101− add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}")
100+ add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE)
101+ add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS})
102102 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
103103endmacro(add_qml_test)
104104
105−macro(add_qmltest_target qmltest_TARGET qmltest_command)
105+macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS)
106106 add_custom_target(${qmltest_TARGET} ${qmltest_command})
107107
108108 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")