diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 21:47:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 21:47:13 (GMT) |
| commit | 68af2fdbb25f8b77a7f314d19d1a0cc50b114e37 (patch) | |
| tree | bf7d6305fa743c73ae7a7f10e9d60ebd01e6d2ae /src/corelib | |
| parent | 91db91cc7d91f767c2cba340d930b72d69a968b8 (diff) | |
| parent | c5809ade611d93c165dbde8c6ee618da73b0ad48 (diff) | |
| download | Qt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.zip Qt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.tar.gz Qt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Memory leak in native Toolbar cleanup in Cocoa
Fix copyright year.
Bump version to 4.6.2.
Add skeleton changes file for 4.6.2.
Add released version of 4.6.1 changes file for posterity.
Designer crashes when previewing QMainWindow with native Toolbar on Mac
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 f350d1a..abdafc3 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.1" +#define QT_VERSION_STR "4.6.2" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040601 +#define QT_VERSION 0x040602 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |