diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 16:40:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 16:40:36 (GMT) |
| commit | c7ad2de8f653c82ed26275d9a1791ebf2bb38644 (patch) | |
| tree | 8cb794acff34db69b93baf4963bf66e19eb877f9 /src/corelib | |
| parent | e61071a2a170eaeb524778e9e903100323b88bbe (diff) | |
| parent | ad8e7b27427825bee730c55735cd2554407205e4 (diff) | |
| download | Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.zip Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.tar.gz Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
Send WinIdChange event when winId is set to zero
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 35607d5..b148a1d 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.1" +#define QT_VERSION_STR "4.7.2" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040701 +#define QT_VERSION 0x040702 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |