summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpixmap
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-271-6/+1
|\
| * tests: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-6/+1
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\ \
| * | Fixed the compilation problem of tests/auto/qpixmap.Liang Qi2009-07-011-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291-2/+2
| |\ \
* | \ \ Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-2528-30/+197
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Made QPixmap autotest pass with -graphicssystem openglSamuel Rødal2009-06-121-32/+73
| * | tst_qpixmap compile fixJoerg Bornemann2009-06-101-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-241-0/+16
| |\ \ | | |/
| * | Long live Qt!Lars Knoll2009-03-2333-0/+1161
| /
* | Introduce Symbian CFbsBitmap <-> QPixmap conversion functions.Jason Barron2009-06-052-12/+108
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-0/+16
|\ \ | |/
| * Fixes: Crash in QPixmap under X11.Trond Kjernaasen2009-03-231-0/+16
| * Long live Qt 4.5!Lars Knoll2009-03-237-0/+1037
* Long live Qt for S60!axis2009-04-247-0/+1059