summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-281-11/+1
|\
| * Remove all the last vestiges of QuickDraw in Qt/Mac.Norwegian Rock Cat2009-07-241-11/+1
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-38/+39
|\ \ | |/
| * Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete.Volker Hilsheimer2009-07-211-36/+34
| * Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-2/+2
| * Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-0/+3
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-11/+8
|\ \ | |/
| * Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-8/+5
| * Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-171-1/+1
| * 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-16/+52
|\ \ \ | |/ /
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-081-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-0/+95
| |\ \ | | |/
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
| |\ \
| * | | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-1/+1
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-14/+0
| * | | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-071-2/+16
| |\ \ \
| * | | | Long live Qt!Lars Knoll2009-03-231-0/+2053
| / / /
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-0/+95
|\ \ \ \ | | |_|/ | |/| |
| * | | qdoc: Moved some qdoc comments to a common cpp file.Martin Smith2009-05-251-0/+95
| | |/ | |/|
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-201-1/+1
|\ \ \ | |/ /
| * | Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| |/
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-2/+16
|\ \ | |/
| * Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-071-2/+16
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+2003
* Long live Qt for S60!axis2009-04-241-0/+2010