diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-02-26 14:00:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-26 21:23:27 +0100 |
| commit | 2c39ede6b0efdb3b8dfbd6812ce1e013ba310eac (patch) | |
| tree | cc7ca26eda4fad5031997e6b769e4a6e03575b3f | |
| parent | 9deef17ae9c85d8efdbceb515206ac31a4356216 (diff) | |
| download | qttools-2c39ede6b0efdb3b8dfbd6812ce1e013ba310eac.tar.gz | |
Use qmake for package dependency resolution in cmake tests.
This allows us to remove hardcoded depends information.
Change-Id: I91150ae89b230ebbbcfc9706b70ea135149af0c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 23ba602c1..e55749230 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -35,8 +35,6 @@ endif() find_package(Qt5Widgets) if (Qt5Widgets_FOUND) - set(Qt5_MODULE_TEST_DEPENDS Xml Widgets) - test_module_includes( Designer QFormBuilder Help QHelpSearchQuery diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb77..db06747ed 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,4 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs +qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST = designer help uitools + CONFIG += ctest_testcase |