From d2cafb8506b798bad7fa56f19557dd6e1cb25cd7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 26 Feb 2013 13:56:22 +0100 Subject: Use qmake for package dependency resolution in cmake tests. This allows us to remove hardcoded depends information. Change-Id: Id094414d27c1da9b957730b0101d920d561d396d Reviewed-by: Oswald Buddenhagen --- 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 2c8e39e7..4eba8604 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( Sensors QLightSensor ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb7..f8c4e0a9 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 = sensors + CONFIG += ctest_testcase -- cgit v1.2.3 From ecd2782929ff8f2a7d2889083fbbca6b2a600777 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 22 Mar 2013 15:33:36 +0100 Subject: sync.profile: Add qtxmlpatterns as a indirect dependency This seems to have been accidentally removed by db4b4e29b9bd2875a69e8d3b53dc28f1748f60c9 Change-Id: I3a03cc3adc80e2795e5e4d56920752ceadedbcef Reviewed-by: Oswald Buddenhagen --- sync.profile | 1 + 1 file changed, 1 insertion(+) diff --git a/sync.profile b/sync.profile index 913c0e90..1dc6dbe5 100644 --- a/sync.profile +++ b/sync.profile @@ -5,6 +5,7 @@ ); %dependencies = ( "qtbase" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", "qtdeclarative" => "refs/heads/stable", "qtjsbackend" => "refs/heads/stable", ); -- cgit v1.2.3