From baaff2692dddf34ccb62557df752fa4b3eb9c38d Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 29 Jan 2019 19:25:24 +0100
Subject: [PATCH 2/6] Add -qt5 suffix to search for Qt tools

---
 cmake/modules/QmlTest.cmake | 4 ++--
 tests/CMakeLists.txt        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/QmlTest.cmake b/cmake/modules/QmlTest.cmake
index 1ac37afd3..5dda594c2 100644
--- a/cmake/modules/QmlTest.cmake
+++ b/cmake/modules/QmlTest.cmake
@@ -114,9 +114,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}
     )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 33cf60049..86cf3f876 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -135,11 +135,11 @@ endfunction()
 if(DEFINED ENV{DEB_BUILD_MULTIARCH})
   set(QDBUSXML2CPP_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp")
 else()
-  FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp)
+  FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp-qt5)
 endif()
 
 if(NOT QDBUSXML2CPP_EXECUTABLE)
-    message(FATAL_ERROR "qdbusxml2cpp not found")
+    message(FATAL_ERROR "qdbusxml2cpp-qt5 not found")
 endif()
 
 install(DIRECTORY data graphics
-- 
2.49.0