| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
|\ |
|
| * | QImage crash when invalid XPM is read. | Niklas Kurkisuo | 2011-02-18 | 1 | -1/+1 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-09 | 2 | -0/+29 |
|\ \ |
|
| * | | Fix build failure | Gareth Stockwell | 2011-02-09 | 2 | -6/+6 |
|
|
| * | | Recreate Symbian raster backing store when WA_TranslucentBackground set | Gareth Stockwell | 2011-02-09 | 2 | -0/+29 |
| |/ |
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-08 | 1 | -0/+2 |
|\ \ |
|
| * | | Don't crash when BMP color table is broken | Harald Fernengel | 2011-02-04 | 1 | -0/+2 |
| |/ |
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 1 | -2/+8 |
|\ \
| |/ |
|
| * | Fix loop count in animanted gifs sometimes being incorrect | Simon Hausmann | 2011-01-24 | 1 | -2/+8 |
|
|
* | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 75 | -77/+77 |
|\ \
| |/ |
|
| * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 75 | -75/+75 |
|
|
| * | Made documentation of QPixmap::createMaskFromColor match behaviour. | Samuel Rødal | 2010-12-22 | 1 | -2/+2 |
|
|
* | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 2 | -8/+28 |
|\ \
| |/ |
|
| * | Prevent always deep-copying in QPixmap::toImage() for raster pixmaps. | Samuel Rødal | 2010-12-07 | 1 | -5/+8 |
|
|
| * | Make sure to do a deep copy of a QImage when it's being painted on. | Samuel Rødal | 2010-12-06 | 2 | -8/+25 |
|
|
* | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 1 | -34/+47 |
|\ \
| |/ |
|
| * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. | aavit | 2010-12-01 | 1 | -1/+2 |
|
|
| * | Workaround for certain malformed PNGs that lack the final crc bytes | aavit | 2010-12-01 | 1 | -34/+46 |
|
|
* | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 6 | -11/+24 |
|\ \
| |/ |
|
| * | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 2 | -2/+2 |
|
|
| * | Fixed tst_qwidget::testContentsPropagation auto-test failure. | Samuel Rødal | 2010-11-09 | 1 | -3/+5 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 1 | -2/+3 |
| |\ |
|
| | * | Fixed grabWidget sometimes returning uninitialized memory. | Samuel Rødal | 2010-11-03 | 1 | -2/+3 |
|
|
| * | | Prevent excessive seeks in xbm detection | Harald Fernengel | 2010-11-04 | 1 | -8/+17 |
| |/ |
|
| * | Major refactoring: creating a new QPixmapData subclass for live textures. | Michael Dominic K | 2010-10-21 | 1 | -1/+1 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-12 | 1 | -0/+1 |
| |\ |
|
| | * | Add TIFFClose to QTIffHandler::option() to avoid memory leak | Topi Reiniö | 2010-10-11 | 1 | -0/+1 |
|
|
* | | | doc: Moved some table headers ahead of the rows. | Martin Smith | 2010-10-22 | 1 | -4/+4 |
|/ / |
|
* | | Fix for CFbsBitmap to QPixmap conversion. | Jani Hautakangas | 2010-10-12 | 1 | -1/+2 |
|/ |
|
* | Avoid in-place convertion of images with multiple references | Benjamin Poulain | 2010-10-08 | 1 | -0/+4 |
|
|
* | Live texture updates to meegographicssystem plugin. | Michael Dominic K | 2010-10-07 | 1 | -0/+1 |
|
|
* | Fixed potential crash when loading corrupt GIFs. | Kim Motoyoshi Kalland | 2010-09-28 | 1 | -2/+11 |
|
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | aavit | 2010-09-27 | 2 | -14/+32 |
|\ |
|
| * | Compile on Symbian - rework the X11 mask patch a bit. | Trond Kjernåsen | 2010-09-23 | 5 | -20/+17 |
|
|
| * | Fixed QPixmap::resize() for X11 pixmap with masks. | Trond Kjernåsen | 2010-09-23 | 1 | -9/+14 |
|
|
| * | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. | Trond Kjernåsen | 2010-09-22 | 4 | -1/+17 |
|
|
* | | Avoid creating copy of an image in memory when storing as png | aavit | 2010-09-27 | 1 | -47/+45 |
|
|
* | | Optimization of pixel conversion when storing jpeg | aavit | 2010-09-24 | 1 | -13/+19 |
|/ |
|
* | Avoid creating copy of an image in memory when storing as jpeg | aavit | 2010-09-21 | 1 | -28/+13 |
|
|
* | Fixed infinite loop when loading jpeg without EOI from memory. | Kim Motoyoshi Kalland | 2010-09-20 | 1 | -11/+8 |
|
|
* | Give a warning in QPixmap::handle() if pixmap is not X11 class. | Samuel Rødal | 2010-09-20 | 1 | -2/+6 |
|
|
* | Fixed memory corruption issue in qt_blurImage for Indexed8 images. | Samuel Rødal | 2010-09-17 | 1 | -4/+11 |
|
|
* | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 1 | -1/+1 |
|\ |
|
| * | Fixed regression in QPixmap::size() for null pixmaps. | Samuel Rødal | 2010-09-16 | 1 | -1/+1 |
|
|
* | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 1 | -5/+0 |
|\ \
| |/ |
|
| * | Remove unnecessary function declarations from qpixmap_s60_p.h | Jani Hautakangas | 2010-09-07 | 1 | -5/+0 |
|
|
* | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 2 | -8/+10 |
|\ \
| |/ |
|
| * | Remove unused variable | Thomas Zander | 2010-09-07 | 1 | -1/+0 |
|
|
| * | Make compile on gcce | Thomas Zander | 2010-09-07 | 2 | -7/+10 |
|
|
* | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 2 | -2/+53 |
|\ \
| |/ |
|