summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-305-6/+38
|\
| * Fix threaded QImage text drawing under Windows.Trond Kjernaasen2009-03-301-1/+3
| | | | | | | | | | | | | | | | qt_win_display() will always trigger an assert and should not be used in the src/painting directory. Task-number: 248266 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| * Fix draImage() calls for threaded printing to a PostScript printer.Trond Kjernaasen2009-03-304-5/+35
| | | | | | | | | | | | | | | | QPicture didn't have an implementation for drawImage(). All images were converted to QPixmaps before they were drawn. Task-number: 249322 Reviewed-by: Gunnar Sletta
* | Merge branch '4.5'Thiago Macieira2009-03-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * Fix QPixmap::fromImage() bug for monochrome images on Mac.Samuel Rødal2009-03-271-1/+1
| | | | | | | | | | | | | | | | Monochrome images should be converted to black and white, not transparent and white. Reported on qt-interest. Task-number: 249175 Reviewed-by: Trond
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-242-0/+7
|\ \ | |/
| * Fixes: Crash in QPixmap under X11.Trond Kjernaasen2009-03-232-0/+7
| | | | | | | | | | | | | | | | | | Task: 246446 RevBy: Olivier AutoTest: tst_qpixmap::test_246446() Details: The new QX11PixmapData object wasn't referenced (e.g. the ref count would be 0) after calling setMask() on a 32 bit QPixmap when Xrender was used.
| * Long live Qt 4.5!Lars Knoll2009-03-2357-0/+30749
|
* Long live Qt!Lars Knoll2009-03-2357-0/+30847