diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 16:34:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 16:34:00 (GMT) |
| commit | b22e564844fdba82ddea665c55d0498a4caa1b14 (patch) | |
| tree | e12aa66748f464983522595fcecb201d124a25c2 /src/gui/text/qfontengine_mac.mm | |
| parent | b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d (diff) | |
| parent | 4778af08ca848c82526305c66dc23bb6b732b944 (diff) | |
| download | Qt-b22e564844fdba82ddea665c55d0498a4caa1b14.zip Qt-b22e564844fdba82ddea665c55d0498a4caa1b14.tar.gz Qt-b22e564844fdba82ddea665c55d0498a4caa1b14.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:
QDesktopServices crashes when accessing the NULL X11 variable
Revert "Fix the byte order in QImage::fill for 24bpp formats"
Fix crash when setting font decorations on text drawn with QStaticText
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
0 files changed, 0 insertions, 0 deletions