summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-12/+31
|\
| * Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-231-3/+17
| * Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-221-1/+1
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-3/+7
| |\ \ | | |/
| | * Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| | * Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
* | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-181-2/+6
* | | Make raster the default graphics system on X11.Samuel Rødal2010-09-171-0/+5
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-3/+5
|\ \ | |/
| * Revised fix for pixmap loadingJens Bache-Wiig2010-08-201-0/+5
| * Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-191-3/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+22
|\ \ | |/
| * Add QPixmap::fromImageReader() to decode arbitrary images in place.Benjamin Poulain2010-06-301-1/+22
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-061-1/+1
|\ \ | |/ |/|
| * Add an application attribute to control XInitThreads().Trond Kjernåsen2010-07-021-2/+1
| * More work on GL threading.Trond Kjernåsen2010-07-021-0/+1
* | add docu about pixmaps being invalidated on qapp destructionOswald Buddenhagen2010-06-071-0/+3
|/
* Some optimizations for QImage::load()Jens Bache-Wiig2010-06-011-2/+9
* Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-271-2/+2
|\
| * doc: Fixed many broken links.Martin Smith2010-05-201-2/+2
* | QRuntimeGraphicsSystemJani Hautakangas2010-05-201-13/+27
|/
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-14/+11
|\
| * Fixed QPixmap::load() to not modify referenced copies (again!)Trond Kjernåsen2010-03-011-13/+6
| * Fixed autotest tst_QWidget::translucentWidget() on Windows Vista & abovePrasanth Ullattil2010-02-261-1/+5
* | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-4/+5
|\ \ | |/
| * document the slowness of QPixmap::hasAlpha()Gunnar Sletta2010-02-111-4/+5
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-9/+3
|\ \ | |/
| * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-291-9/+3
* | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-4/+5
* | Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-011-2/+18
* | Merge branch '4.6'Thiago Macieira2010-01-211-7/+14
|\ \ | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-201-1/+1
| |\
| * | Fixed QBitmap::load to load into bitmap format again.Gunnar Sletta2010-01-201-7/+14
* | | Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-081-1/+1
| |\ \ | | |/ | |/|
| | * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | | Merge branch '4.6'Thiago Macieira2010-01-121-1/+3
|\ \ \ | |/ /
| * | Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.Gunnar Sletta2010-01-081-1/+3
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-261-5/+4
|\ \ | |/
| * Fixed QPixmap::load() to not modify referenced copies.Trond Kjernåsen2009-12-181-5/+4
* | Merge branch '4.6'Thiago Macieira2009-12-021-2/+2
|\ \ | |/
| * Fix crash in qt3support QPixmap constructorGunnar Sletta2009-12-011-2/+2
* | Fixed QPixmap::grabWidget() on widgets that have not yet been shown.Kim Motoyoshi Kalland2009-11-121-2/+5
|/
* API review: Rename numCols() -> colorCount()Marius Storm-Olsen2009-11-061-0/+7
* Fixed crash in QPixmap::resize_helper on mac and x11Gunnar Sletta2009-11-051-2/+2
* Lazily construct QPixmapData's for null pixmapsGunnar Sletta2009-10-301-26/+38
* QPixmap::loadFromData: Do not crash on empty/invalid data/lengthMarkus Goetz2009-10-261-0/+3
* updated documentation for QPixmap::fromImage()Gunnar Sletta2009-10-221-5/+7
* Separate modification & destruction pixmap cleanup hooksTom Cooksey2009-10-191-3/+4
generated by cgit v0.12 at 2024-11-25 14:33:13 (GMT)