summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-5/+5
|\
| * Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-171-3/+3
| * 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
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+304
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-2/+8
|\ \ | |/
| * Remove the Direct3D engine.Gunnar Sletta2009-04-241-2/+0
| * Long live Qt!Lars Knoll2009-03-231-0/+312
* namespace fixes. s60main and corelib now compiles under a namespaceJanne Koskinen2009-06-171-5/+4
* Introduce Symbian CFbsBitmap <-> QPixmap conversion functions.Jason Barron2009-06-051-0/+9
* Long live Qt for S60!axis2009-04-241-0/+304