summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-049-44/+239
|\
| * Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-08-031-0/+1
| * Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-308-44/+238
| |\
| | * Refactor texture_from_pixmap to not re-create the gl surface each bindTom Cooksey2009-07-291-0/+1
| | * Move uninit & readonly into a flags member of QX11PixmapDataTom Cooksey2009-07-293-16/+23
| | * Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-285-28/+214
* | | 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-291-1/+2
|\ \ | |/
| * Doc: Obsolete QMatrix and QPainter APIs using it.Volker Hilsheimer2009-07-271-1/+2
* | Merge commit 'qt/master-stable'Jason Barron2009-07-285-98/+6
|\ \ | |/
| * 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: \em is not a qdoc command, \e is correctVolker Hilsheimer2009-07-251-2/+2
| * Nested classes need to be exported as well.Volker Hilsheimer2009-07-241-1/+1
| * Remove all the last vestiges of QuickDraw in Qt/Mac.Norwegian Rock Cat2009-07-243-94/+3
| * 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-277-114/+92
|\ \ | |/
| * Doc: More docu for the QPixmapCache::KeyVolker Hilsheimer2009-07-211-1/+13
| * Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete.Volker Hilsheimer2009-07-212-41/+38
| * doc: Changed several \reimp to \internalMartin Smith2009-07-201-10/+0
| * Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-193-3/+5
| * Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-0/+3
| * Move QMacStyle icon handling down to the common style.Norwegian Rock Cat2009-07-171-19/+0
| * Doc: Review of documentation forDavid Boddie2009-07-141-31/+30
| * src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-9/+3
* | Make S60 integration optional.Jason Barron2009-07-151-2/+2
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3057-227/+193
|\ \ | |/
| * Remove these colorspace references.Norwegian Rock Cat2009-06-242-4/+4
| * More culling of Panther Code.Norwegian Rock Cat2009-06-233-74/+14
| * Improve flushing performance in the raster window surface on Mac.Morten Sørvig2009-06-231-2/+6
| * Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-182-16/+9
| * Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-179-18/+47
| * Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1656-112/+112
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1656-112/+112
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2526-130/+621
|\ \ \ | |/ /
| * | 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
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-111-1/+1
| * | small changes in private headersThierry Bastian2009-06-091-1/+1
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-084-2/+6
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't s...David Faure2009-06-041-1/+1
| * | Add an extra explanation for the API extension.Alexis Menard2009-06-041-1/+4
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-3/+6
| |\ \ | | |/
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-87/+95
| |\ \
| * \ \ Integrate merge-request #419 into branch 'master'Simon Hausmann2009-05-271-0/+1
| |\ \ \
| | * | | Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-05-271-0/+1
| * | | | Add comparation of images with indexed colorBenjamin Poulain2009-05-271-5/+5
| * | | | Optimized QRasterPixmapData::metric.Samuel Rødal2009-05-271-11/+22