From 4a35846cb643a1f94db6ea820d15250fc690ea07 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Tue, 26 Feb 2013 13:54:44 +0100
Subject: [PATCH] Use qmake for package dependency resolution in cmake tests.
This allows us to remove hardcoded depends information.
Change-Id: I778e3ca6a5f3f316948c652f4f30f00ebbf900cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
tests/auto/cmake/CMakeLists.txt | 2 --
tests/auto/cmake/cmake.pro | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index c64fa05c..f381519f 100644
--- 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 Core)
-
test_module_includes(
Script QScriptEngine
ScriptTools QScriptEngineDebugger
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb7..6a28b366 100644
--- 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 = script
+
CONFIG += ctest_testcase
--
GitLab