From 204dc6d2f6c2e0737dd0905577bc16a0f8ddf339 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Tue, 26 Feb 2013 13:57:50 +0100
Subject: Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

Change-Id: I362c58cd27341932a7e8ad5e0bb96375249a3ea9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 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 37e4100..c66b753 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 Widgets)
-
 test_module_includes(
   Svg QSvgWidget
 )
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb..4463bd0 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 = svg
+
 CONFIG += ctest_testcase
-- 
cgit v1.2.1


From 7f5de2ce90c84193885cddadd7bae7da9f8bb164 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 26 Feb 2013 13:30:51 +0100
Subject: define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: If2aa30a217e8042f8571b93f42d826ddad41d9bd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .qmake.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.qmake.conf b/.qmake.conf
index 5de255c..02554ab 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.0.2
-- 
cgit v1.2.1