diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 10:57:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 10:57:50 (GMT) |
| commit | 0a5c8216bfd0fcb733d99b388a7b87ffafbf0172 (patch) | |
| tree | 9ee25adb0ed18570ba0f0778f949402e3875c413 /src/3rdparty | |
| parent | 26b07492710de0551bb21d7fd1e7767d5093cf7d (diff) | |
| parent | ec44f83c4c7fa77e609a2458c4a5e26054fd5e85 (diff) | |
| download | Qt-0a5c8216bfd0fcb733d99b388a7b87ffafbf0172.zip Qt-0a5c8216bfd0fcb733d99b388a7b87ffafbf0172.tar.gz Qt-0a5c8216bfd0fcb733d99b388a7b87ffafbf0172.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:
Fix rendering with simple shader in GL2 engine
removed a debug trace
Fix documentation bug in QColor
Don't use a mutex lock in QPainter::redirection unless strictly required
Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.
Pass value as const void *const to QGraphicsSceneIndex::itemChange.
Optimize QGraphicsItem::setFlags.
Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper
Improve performance of QGraphicsItem::setParentItem.
Make sure cursor is painted at the correct position when we are using IM.
Purely cosmetic (formatting) changes to GL2 engine's GLSL
Use an attribute value for the PMV matrix rather than a uniform
Remove unnecessary depth uniform from GL2 engine's GLSL
Doc fixes: Remove some lies from QEasingCurve.
Fix how we select antialiasing method for text under Mac OS X
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions