summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2011-05-24 07:02:17 (GMT)
committerIikka Eklund <iikka.eklund@digia.com>2011-06-16 07:06:03 (GMT)
commitfb596349a579aace0f130d541c4c6674fbaf1da1 (patch)
tree5f5af21463972556328e466900f2e96503433825 /src
parentd090deecf74e4bad670f9bf4ac9e013e69e27c80 (diff)
downloadQt-fb596349a579aace0f130d541c4c6674fbaf1da1.zip
Qt-fb596349a579aace0f130d541c4c6674fbaf1da1.tar.gz
Qt-fb596349a579aace0f130d541c4c6674fbaf1da1.tar.bz2
Qt version number change into 4.6.4
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.h4
-rw-r--r--src/plugins/qpluginbase.pri2
-rw-r--r--src/qbase.pri2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 103da13..2b79ecf 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -44,11 +44,11 @@
#include <stddef.h>
-#define QT_VERSION_STR "4.6.3"
+#define QT_VERSION_STR "4.6.4"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_VERSION 0x040603
+#define QT_VERSION 0x040604
/*
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
*/
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}
}
diff --git a/src/qbase.pri b/src/qbase.pri
index 6f2dfa4..1556245 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
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}
}