diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:31:23 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:31:23 +0100 |
| commit | 91d8066dfecbc9fa17d8d9ec0709ce073fc5e227 (patch) | |
| tree | 5021e1bad24805019cfae38eb0be8aac16b1f3fc | |
| parent | 27ad55073c776b2bcb548ee2a15d166b077e5e0e (diff) | |
| parent | 9c79ef0046c550614964afb8feb734c96853691c (diff) | |
| download | qtsvg-91d8066dfecbc9fa17d8d9ec0709ce073fc5e227.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie20ac6e6760ecc3a1b0147db78d40d9d69c21479
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 02554ab..6aa780c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.0.2 +MODULE_VERSION = 5.1.0 diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index c66b753..c9c5973 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -10,5 +10,5 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") test_module_includes( - Svg QSvgWidget + Svg QSvgRenderer ) |