diff options
| author | Marko Valtanen <marko.valtanen@digia.com> | 2012-12-04 14:49:04 (GMT) |
|---|---|---|
| committer | Marko Valtanen <marko.valtanen@digia.com> | 2012-12-04 14:52:31 (GMT) |
| commit | 49f1d4e1bddbf2c4da9ea10ebb3f4b2f77bac1a3 (patch) | |
| tree | 29afed7ed3af268d24dd4610fcc6adea013b5255 /src | |
| parent | bab8ee24d0a0b283ab0f496a8ed9406efff7db77 (diff) | |
| download | Qt-49f1d4e1bddbf2c4da9ea10ebb3f4b2f77bac1a3.zip Qt-49f1d4e1bddbf2c4da9ea10ebb3f4b2f77bac1a3.tar.gz Qt-49f1d4e1bddbf2c4da9ea10ebb3f4b2f77bac1a3.tar.bz2 | |
Version bump to 4.6.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
| -rw-r--r-- | src/plugins/qpluginbase.pri | 2 | ||||
| -rw-r--r-- | src/qbase.pri | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7947fb0..57d7e09 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -45,11 +45,11 @@ #include <stddef.h> -#define QT_VERSION_STR "4.6.4" +#define QT_VERSION_STR "4.6.5" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040604 +#define QT_VERSION 0x040605 /* 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 7eecf03..50e511b 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.4 + VERSION=4.6.5 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qbase.pri b/src/qbase.pri index 1556245..34747e5 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.4 + VERSION=4.6.5 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |