aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-02-25 11:53:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-26 10:10:15 +0100
commita2258b3d4b98c3510eb25f538198fcb69347eed9 (patch)
tree5b559d52511520a2f98cd2432b508926706e63b7
parentccba80ee3e7c13844a769e5cd2213f34842c674b (diff)
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>
-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 a88564e0b7..f62d2f3bdb 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 Network Gui)
-
test_module_includes(
Qml QQmlEngine
Quick QQuickWindow
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb772..0a5e7e75fc 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 = quick qml
+
CONFIG += ctest_testcase