diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:25 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:25 +0100 |
| commit | ea98b4694c7a0674293e71cb20c15c3607cfb258 (patch) | |
| tree | b3ad5b2898c579af1f583556fbb87a17f9f71db0 /tests | |
| parent | 4bddc101ea7bace61397f44a0f7e9a9f92c92f09 (diff) | |
| parent | 8b76d788604ff4e89198813c542e6bb440b202fb (diff) | |
| download | qttools-ea98b4694c7a0674293e71cb20c15c3607cfb258.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/test_translation_macros/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 4 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 diff --git a/tests/auto/cmake/test_translation_macros/CMakeLists.txt b/tests/auto/cmake/test_translation_macros/CMakeLists.txt index f620059c3..14ecb40e3 100644 --- a/tests/auto/cmake/test_translation_macros/CMakeLists.txt +++ b/tests/auto/cmake/test_translation_macros/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8) project(test_translation_macros) -find_package(Qt5Core REQUIRED) -find_package(Qt5LinguistTools REQUIRED) +find_package(Qt5Core 5.0.0 REQUIRED) +find_package(Qt5LinguistTools 5.0.0 REQUIRED) include_directories( ${Qt5Core_INCLUDE_DIRS} |