diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 05:45:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 05:45:12 (GMT) |
| commit | 12377c11120fd49ee2c29fd5026572298f4570ad (patch) | |
| tree | 0a8d0d0083a182bed9d71565a5d669462d0510d2 /.gitignore | |
| parent | 02d3230a6b569e848bdae30ac2184613aade64ff (diff) | |
| parent | 759fe35812975104f3b73934d7d179159ce9effa (diff) | |
| download | Qt-12377c11120fd49ee2c29fd5026572298f4570ad.zip Qt-12377c11120fd49ee2c29fd5026572298f4570ad.tar.gz Qt-12377c11120fd49ee2c29fd5026572298f4570ad.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:
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 '.gitignore')
0 files changed, 0 insertions, 0 deletions