summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-06 14:00:58 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-06 14:00:58 +0100
commit648b1846d9bd6d7aac65095c21bd2c6d72bfa408 (patch)
tree40e7c9810f940088fb1cf8b5a524d716322c595f
parent0a575c4bdafd9fb4827b9c51c2c5e2d02a3837cf (diff)
parentde349a576481ed05756e90d7022ddf0d1aaf49b7 (diff)
downloadqtxmlpatterns-648b1846d9bd6d7aac65095c21bd2c6d72bfa408.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0bb29c2a3f076341bc99aaf2b4fa0f09ddd720c7
-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 fda4e5e..b869eaa 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)
-
test_module_includes(
XmlPatterns QXmlQuery
)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb..d69a54f 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 = xmlpatterns
+
CONFIG += ctest_testcase