diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 12:33:30 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 12:33:30 (GMT) |
commit | 12689cc05936d675c8a7065cf39b8334b83f95bb (patch) | |
tree | c77f27c34fa09adafa879a5b183b056a7adbb3be /dist/changes-4.1.0 | |
parent | deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5 (diff) | |
parent | 8621d989b80bd384826569e6f6fec25fe3327c94 (diff) | |
download | Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.zip Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.tar.gz Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.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:
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
Diffstat (limited to 'dist/changes-4.1.0')
0 files changed, 0 insertions, 0 deletions