diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 02:31:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 02:31:46 (GMT) |
| commit | 80c2e1211065f606c6f39e708a74afad1c624663 (patch) | |
| tree | 48f9a9ae5e308c9c4c0d43a39d78ace5f9317499 /src/corelib | |
| parent | ee9e29a9d203ed1404810aa4097bb8e0db483dda (diff) | |
| parent | eb2926a2f9607e985b8bca54346e6fdf91343247 (diff) | |
| download | Qt-80c2e1211065f606c6f39e708a74afad1c624663.zip Qt-80c2e1211065f606c6f39e708a74afad1c624663.tar.gz Qt-80c2e1211065f606c6f39e708a74afad1c624663.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits)
Fixed drawing a large number of glyphs with the same font under GL.
Bump version to 4.7.1.
Qt headers must be included before X11 headers
Fixes bezier curves not being drawn when it is a line.
Avoid creating copy of an image in memory when storing as jpeg
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
Add exception barrier to QCertificateRetriever::RunL()
Reference correct declarative elements page.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
Doc: updating the qdocconf files and the stylesheet
Doc: updating details on Tier 2 platforms
Doc: adding remark on release of qt quick element support in creator
Update configure.exe
Revert "let WebKit inject itself into the qt configuration"
Revert "fix qt_webkit_version.pri install for in-Qt builds"
Revert "Fixed incorrect Symbian scoping."
QS60Style: Itemviews are drawn incorrectly
Change to commercial license headers in preparation for release.
...
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 8f27b03..c906a1c 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.0" +#define QT_VERSION_STR "4.7.1" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040700 +#define QT_VERSION 0x040701 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ |