diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-12-04 14:02:35 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-12-04 14:02:35 (GMT) |
| commit | 33441e2a611f07207b0b942368aab9010cdf8ab1 (patch) | |
| tree | 77a223255bab621549f340c86fe19005f1ebbc62 /src/corelib/global/qglobal.h | |
| parent | 77f274672480e5980d9f42e4fd94c9770279543b (diff) | |
| parent | b6cf9e28c2fef9112789e98ac9d1eda45a407889 (diff) | |
| download | Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.zip Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.gz Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -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 2e9f839..6623e0c 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.0" +#define QT_VERSION_STR "4.6.1" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040600 +#define QT_VERSION 0x040601 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |