diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 17:41:48 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 17:41:48 (GMT) |
commit | 185388c0bf0f258d070376a2a3e50b9e89e1a249 (patch) | |
tree | 609422b6a448e3670956686442fe574335507db4 /src/gui/kernel/qcocoaview_mac.mm | |
parent | 304c70a03406eb16b9a08719769655b75bf6d8e3 (diff) | |
parent | e7b0998325a66ecb9f979f253d732db85e1f43d1 (diff) | |
download | Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.zip Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.tar.gz Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.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:
QGraphicsItem::hasFocus() performance regression.
Fix crashes in QByteArray
Move the labels a bit down so that they align better vertically with the field.
Add command to qmake to do symbian-uid generation
Fixed QBitmap::load to load into bitmap format again.
Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
Text drawing is not fast currently
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
0 files changed, 0 insertions, 0 deletions