summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-041-12/+5
|\
| * Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-301-12/+5
| |\
| | * Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-281-12/+5
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-4/+11
|\ \ \ | |/ /
| * | Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2Volker Hilsheimer2009-07-281-4/+11
| |/
* | Merge commit 'qt/master-stable'Jason Barron2009-07-281-3/+2
|\ \ | |/
| * Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-251-3/+2
| * Revert "Doc: Clarified that the format used in QImage::fromData() is the image"Volker Hilsheimer2009-07-251-31/+27
| * Doc: Clarified that the format used in QImage::fromData() is the imageDavid Boddie2009-07-231-27/+31
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-6/+5
|\ \ | |/
| * Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete.Volker Hilsheimer2009-07-211-5/+4
| * Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-1/+1
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-10/+6
|\ \ | |/
| * Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-8/+4
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-8/+17
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-0/+5
| |\ \ | | |/
| | * Make sure QImage::mirrored() doesn't crash if it runs out of memory.Trond Kjernåsen2009-06-101-0/+5
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-081-1/+1
| * | Add comparation of images with indexed colorBenjamin Poulain2009-05-271-5/+5
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
| |\ \ | | |/
| * | Tiny optimization to QImage::setColorTable()Gunnar Sletta2009-04-151-2/+6
* | | Make Qt exception safer.Robert Griebl2009-06-101-3/+14
| |/ |/|
* | Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
|/
* Compile.Norwegian Rock Cat2009-04-071-1/+1
* Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-071-1/+11
* Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+6119