diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 15:40:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 15:40:48 (GMT) |
| commit | e32bb8f0e79232419b9516fa8273eadbaa8aad9e (patch) | |
| tree | 7251daf2ae329d3df5a8ae2b98b448e004c13acf /dist | |
| parent | ec82a2e2c596fd623c58a4a003dd2e7603931993 (diff) | |
| parent | 48cce37f6faa2aae9b15edc9543f0e7e08236bb1 (diff) | |
| download | Qt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.zip Qt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.tar.gz Qt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: the QTextDecoder need to be destroyed, reflect that in the example
added CONFIG += console to qlalr.pro
Add new benchmark for some qtext features.
Add texture glyph width cache default.
Update changes file
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1 index 2397228..145e09e 100644 --- a/dist/changes-4.6.1 +++ b/dist/changes-4.6.1 @@ -51,6 +51,8 @@ QtGui in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics system is active and the appropriate extensions are present in the GL implementation. + - QGraphicsObject + * 'id' property was removed. Use the 'objectName' property instead. QtDBus ------ |