summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.cpp
Commit message (Collapse)AuthorAgeFilesLines
* More culling of Panther Code.Norwegian Rock Cat2009-06-231-3/+3
| | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* 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
| | | | | | | | Reviewed-by: Trust Me
* | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-111-1/+1
| |
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-3/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Fixed a problem with streaming QIcons containing multiple pixmaps.Trond Kjernåsen2009-05-281-3/+6
| | | | | | | | | | | | | | | | | | If pixmaps were added through QIcon::addFile() with different sizes than the sizes of the pixmaps themselves, streaming the icon in didn't work properly. Task-number: 254374 Reviewed-by: Kim
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-0/+3
|\ \ | |/
| * Document a gotcha with QIcon::addFileNorwegian Rock Cat2009-05-121-0/+3
| | | | | | | | | | | | | | addFile makes a QIcon not null, which may be a surprise if the path given is bad. Reviewed-by: Jens Bache-Wiig
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1128
|
* Make QIcon update after palette changesJens Bache-Wiig2009-04-151-0/+2
| | | | | | | | We have to add the palette cacheKey to ensure that the icon is properly regenerated after a system palette change. Task-number: 250542 Reviewed-by: nrc
* Long live Qt!Lars Knoll2009-03-231-0/+1128