diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:28 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:28 +0100 |
| commit | 954bb7b9603e6049ef3b22ddd5fad2b324d937c3 (patch) | |
| tree | 9fd3db2fa39826639f51a931c2638143df7c9c67 /tests | |
| parent | 788715e176f2dc4d600a405511519fd61d1ad717 (diff) | |
| parent | 403e829f9dd4ad981c589b1f1e943a5bfbb9b1f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
Diffstat (limited to 'tests')
| -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 dd0648211..5d23068d8 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 bf2dbcb77..50a944114 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 |