diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
| commit | 1d8b7f41a5393f77eb3079513b083739edd90b91 (patch) | |
| tree | 232e346dba7226f35af80043e072538dba473201 /tests/auto/mediaobject/dummy/dummy.pro | |
| parent | 624368f588e555f523fc507986bf3ec80681be48 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.zip Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.gz Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'tests/auto/mediaobject/dummy/dummy.pro')
| -rw-r--r-- | tests/auto/mediaobject/dummy/dummy.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro index 88b864b..9797500 100644 --- a/tests/auto/mediaobject/dummy/dummy.pro +++ b/tests/auto/mediaobject/dummy/dummy.pro @@ -1,7 +1,7 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.4 + VERSION=4.7.4 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |