summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/ico
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-271-0/+12
|\
| * Partial fix for Qt issue #244648 - QtIcoHandler does not support large & Vist...miniak2009-07-201-0/+12
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-303-6/+6
|\ \ | |/
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-163-6/+6
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-163-6/+6
| | * Long live Qt 4.5!Lars Knoll2009-03-234-0/+1042
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-170/+161
|\ \ | |/
| * Improve the icon parsing for files with a slightly wrong BMP header.Jan-Arve Sæther2009-04-221-32/+28
| * Clean up white space.Jan-Arve Sæther2009-04-201-165/+160
| * Long live Qt!Lars Knoll2009-03-234-0/+1042
* Long live Qt for S60!axis2009-04-244-0/+1044