From 9b3b9fbd02210a19d989a52be08453137c246b36 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 26 Feb 2013 13:26:45 +0100 Subject: [PATCH] Use qmake for package dependency resolution in cmake tests. This allows us to remove hardcoded depends information. Change-Id: If8f3b8e9e75db3b0b78864626314ebebb96c548f 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 dd064821..5d23068d 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 Widgets) - test_module_includes( Multimedia QCamera MultimediaWidgets QVideoWidget diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb7..50a94411 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 = multimedia multimediawidgets + CONFIG += ctest_testcase