diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:21 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:21 +0100 |
commit | 27ad55073c776b2bcb548ee2a15d166b077e5e0e (patch) | |
tree | a1ecb923f137524235540c9bbec50188d6265a2b | |
parent | 792e612ea27a9622e27914e955fa0b133a3b5fe9 (diff) | |
parent | ffafc258bb4d20d6c174e78240dd7a20e4cdb803 (diff) | |
download | qtsvg-27ad55073c776b2bcb548ee2a15d166b077e5e0e.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I72bdbfcf34983d76ce9fa2d4c1e1304324615107
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/cmake/cmake.pro | 2 |
3 files changed, 4 insertions, 2 deletions
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 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 |