Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

Change-Id: Ia2b364a65484a2d99320cc3d45cfcbb5a0b68c6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index a88564e..f62d2f3 100644 (file)
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -9,8 +9,6 @@ find_package(Qt5Core REQUIRED)
 
 include("${_Qt5CTestMacros}")
 
-set(Qt5_MODULE_TEST_DEPENDS Network Gui)
-
 test_module_includes(
   Qml QQmlEngine
   Quick QQuickWindow

diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb..0a5e7e7 100644 (file)
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -2,4 +2,6 @@
 # Cause make to do nothing.
 TEMPLATE = subdirs
 
+CMAKE_QT_MODULES_UNDER_TEST = quick qml
+
 CONFIG += ctest_testcase