diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-01 15:36:05 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-01 15:36:05 (GMT) |
| commit | 7e8d20de90af2e5ea199b6a92830cc223cea777b (patch) | |
| tree | 89364f787fad44c2fdea1de6358140c568a82e7a /tests/auto/mediaobject | |
| parent | f3cf5dd98e321980984288a1768f3375a8349800 (diff) | |
| parent | afe0f17eb5974adbedd1bc1f2fcd98459d92df47 (diff) | |
| download | Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.zip Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.gz Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.bz2 | |
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'tests/auto/mediaobject')
| -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 5417b50..2f27c4a 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.1 + VERSION=4.6.2 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |