diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 00:24:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 00:24:42 (GMT) |
| commit | 011c6d0f7498bf390e8df1ae646cfb649d8e143f (patch) | |
| tree | cf4ee761e8a9ccc9890882366c8a537fc29ef162 /src/corelib | |
| parent | acbfa8717b07c2d5b85c62bcf70da3ef4983addb (diff) | |
| parent | 123a3aacd6a40fb07a225ef4db34ff7f986363ce (diff) | |
| download | Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.zip Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.tar.gz Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bump Qt version to 4.7.4
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
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 ca63ebd..55c96c6 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.7.3" +#define QT_VERSION_STR "4.7.4" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040703 +#define QT_VERSION 0x040704 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |