summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-02-26 13:54:44 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-26 21:21:52 +0100
commit4a35846cb643a1f94db6ea820d15250fc690ea07 (patch)
tree3f04d725d90c4cc730334ca5e0687a1fdc9cceb7 /tests
parentd4fbebb3e3b7c8f0c171a76f7ea2314985d5fb2a (diff)
downloadqtscript-4a35846cb643a1f94db6ea820d15250fc690ea07.tar.gz
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>
Diffstat (limited to 'tests')
-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 c64fa05..f381519 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 bf2dbcb..6a28b36 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