summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-02-26 13:53:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 15:40:17 +0100
commit983d006ddf09b2ee81ae7aca599e899ca3239858 (patch)
tree2898f60c41824a0be7419952b063cfbad4fc42f8
parent1bb72578a34851d24e173c703a2186b1729b00e5 (diff)
Use qmake for package dependency resolution in cmake tests.
This allows us to remove hardcoded depends information. Change-Id: I55a678dce0cfe84871d3bd2de10a5df2465bf08c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--tests/auto/cmake/CMakeLists.txt2
-rw-r--r--tests/auto/cmake/cmake.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 0ce9542b..f5135cbc 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 Script Widgets)
-
test_module_includes(
Declarative QDeclarativeEngine
)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb7..61e8de78 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 = declarative
+
CONFIG += ctest_testcase