Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
2013-03-14 09:25:28 +01:00
parent 788715e176 403e829f9d
commit 954bb7b960
17 changed files with 370 additions and 218 deletions
--- 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
--- 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