summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-0/+3
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-037-3/+1114
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| * | | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-013-5/+7
| |\ \ \ | | | |/ | | |/|
| * | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-287-3/+1116
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-181-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-104-4/+35
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-092-0/+29
| |\ \ \ | | | |/ | | |/|
| | * | Fix build failureGareth Stockwell2011-02-092-6/+6
| | * | Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-092-0/+29
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-081-0/+2
| |\ \
| | * | Don't crash when BMP color table is brokenHarald Fernengel2011-02-041-0/+2
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-2/+8
| |\ \ | | |/
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1375-77/+77
| |\ \
| * \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-152-8/+28
| |\ \ \
| * \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-34/+47
| |\ \ \ \
| * \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-076-11/+24
| |\ \ \ \ \
| * | | | | | doc: Moved some table headers ahead of the rows.Martin Smith2010-10-221-4/+4
* | | | | | | Fixed MIT-SHM errors in QNativeImage.Samuel Rødal2011-02-031-3/+5
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-2/+8
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix loop count in animanted gifs sometimes being incorrectSimon Hausmann2011-01-241-2/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1775-75/+75
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-1075-75/+75
* | | | | | Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
* | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-25/+7
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-241-1/+5
|\ \ \ \ \ \
| * | | | | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-142-8/+28
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-8/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.Samuel Rødal2010-12-071-5/+8
| | * | | | Make sure to do a deep copy of a QImage when it's being painted on.Samuel Rødal2010-12-062-8/+25
| | | |_|/ | | |/| |
* | | | | Corrected documentation for QImage::fill().Kim Motoyoshi Kalland2010-12-131-2/+2
|/ / / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-36/+48
|\ \ \ \ | |/ / /
| * | | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | |/ | |/|
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-12-022-0/+21
|\ \ \
| * \ \ Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-0/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1914-56/+105
| |\ \ \ \
| * | | | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-282-0/+21
* | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| |_|/ / / |/| | | |
* | | | | Fix some warnings on MacJiang Jiang2010-11-221-0/+2
| |/ / / |/| | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-2/+5
|\ \ \ \ | | |/ / | |/| |