diff options
| author | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
| commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
| tree | d87e517cfab9443926841b3ef92ca715a717f54a /src/plugins/qpluginbase.pri | |
| parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
| parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
| download | Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.zip Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'src/plugins/qpluginbase.pri')
| -rw-r--r-- | src/plugins/qpluginbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index 47ad4a1..6d3e266 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.5.2 + VERSION=4.5.3 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |