diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 02:02:16 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 02:02:16 (GMT) |
commit | 1f5232d0eb8a06ce2bd1b367480f61a109bcfe61 (patch) | |
tree | 82515d0197ff72ef2b5a2c20349f0dab7af36ebd /src/corelib/global | |
parent | dedd3cf2a65b280ced581a2b4edbf68d532e035f (diff) | |
parent | e90cff53cdd7bf0bdfed1f2e8efb90539c6f33ba (diff) | |
download | Qt-1f5232d0eb8a06ce2bd1b367480f61a109bcfe61.zip Qt-1f5232d0eb8a06ce2bd1b367480f61a109bcfe61.tar.gz Qt-1f5232d0eb8a06ce2bd1b367480f61a109bcfe61.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.3
Diffstat (limited to 'src/corelib/global')
-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 501f187..d0fc753 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.2" +#define QT_VERSION_STR "4.7.3" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040702 +#define QT_VERSION 0x040703 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |