summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-113-12/+10
|\
| * Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-101-1/+1
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-091-10/+8
| |\ \
| | * | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| | * | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-041-0/+5
| | |\ \
| | | * | Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-115-2/+78
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.Laszlo Agocs2011-03-101-0/+3
| * | | | Avoid image conversion in fromSymbianCFbsBitmap for certain formats.Laszlo Agocs2011-03-101-0/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-091-1/+1
| |\ \ \ \
| * | | | | Added native image handle provider header.Laszlo Agocs2011-03-081-0/+69
| * | | | | Added native image handle provider support in pixmaps on openvg.Laszlo Agocs2011-03-082-2/+4
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-081-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
generated by cgit v0.12 at 2024-12-29 09:01:52 (GMT)