summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-15 06:06:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-15 06:06:08 (GMT)
commitba3b0feb65ab69214aded7c2f78caece175d59a3 (patch)
tree1088a56487640c6a1651908eec1d78a3410ffc6c /src/plugins
parent0929c3607a01b2b2a2f3af7cdaaf8d85290bc4b7 (diff)
parentd3cd976b8eb3de15a07b0ca9280731958a0147d8 (diff)
downloadQt-ba3b0feb65ab69214aded7c2f78caece175d59a3.zip
Qt-ba3b0feb65ab69214aded7c2f78caece175d59a3.tar.gz
Qt-ba3b0feb65ab69214aded7c2f78caece175d59a3.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Bump version number after 4.6.3 release.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qpluginbase.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index f6a8f87..7eecf03 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
- VERSION=4.6.3
+ VERSION=4.6.4
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}