summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* introduce Q_WS_WINCEMaurice Kalinowski2009-04-295-12/+12
| | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+5
|\
| * QPixmapCache:Remove the old pixmap if you insert one with the same key.Alexis Menard2009-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | If you insert a new pixmap in the cache with a key that was already in the cache then we remove the old pixmap and add the new one. This avoid to fill the memory with garbage even if the cache has a protection to avoid running out of memory. This was discovered with QraphicsView and its cache. We don't need to keep old cached pixmaps for an item. Task-number: KDE Reviewed-by: Trond
* | Remove the Direct3D engine.Gunnar Sletta2009-04-244-32/+0
| |
* | Merge branch '4.5'Thiago Macieira2009-04-201-2/+4
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Fix docs for QPixmapCache::setCacheLimit()/cacheLimit()Gunnar Sletta2009-04-201-2/+4
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Fix an endianess issue with 32 bit pixmaps on big endian systems.Trond Kjernåsen2009-04-171-1/+1
| | | | | | | | | | | | | | | | On big endian systems with Xrender, the QPixmap::toImage() function did an unnecessary byte swap for 32 bit pixmaps. Task-number: 196152 Reviewed-by: Samuel
* | 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
* | Tiny optimization to QImage::setColorTable()Gunnar Sletta2009-04-151-2/+6
| | | | | | | | Task: 250730
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-072-2/+26
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * Compile.Norwegian Rock Cat2009-04-071-1/+1
| | | | | | | | | | | | Looks like a typo. Reviewed-by: Bradley T. Hughes
| * Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-072-3/+27
| | | | | | | | Reviewed-by: Trond
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-6/+10
|\ \ | |/
| * Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
| | | | | | | | | | Task-number: 240164 Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
* | 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