diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 06:06:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 06:06:08 (GMT) |
| commit | ba3b0feb65ab69214aded7c2f78caece175d59a3 (patch) | |
| tree | 1088a56487640c6a1651908eec1d78a3410ffc6c /src/corelib | |
| parent | 0929c3607a01b2b2a2f3af7cdaaf8d85290bc4b7 (diff) | |
| parent | d3cd976b8eb3de15a07b0ca9280731958a0147d8 (diff) | |
| download | Qt-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/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7825f82..ef82b3f 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)) */ |