summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
* Fixed slow QPixmap::fill() when the pixmap is sharing data.Kim Motoyoshi Kalland2009-10-191-1/+11
* Added QPixmapData::createCompatiblePixmapData() used by QPixmap::copy().Samuel Rødal2009-10-141-7/+1
* Fixed documentation of QPixmap::x11Info() to not talk about widgets.Samuel Rødal2009-10-121-5/+5
* Fixed bug where calling fill on pixmap with active painter would crash.Kim Motoyoshi Kalland2009-10-091-0/+10
* * QPixmap: Add toWinHICON() & fromWinHICON() methodminiak2009-09-221-4/+32
* Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-181-3/+10
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Re-enabled the QPixmap cleanup hooks in QPixmap destructor.Trond Kjernåsen2009-08-281-0/+2
* | make QPixmap rely on QPixmapData for loading from files and from data...gunnar2009-08-241-26/+3
* | Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.Jason Barron2009-08-201-6/+6
* | Use QExplicitlySharedDataPointer wherever possibleHarald Fernengel2009-08-201-33/+14
* | Merge commit 'qt/master'Jason Barron2009-08-181-2/+2
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-2/+2
* | | Partially revert oom safety fixesHarald Fernengel2009-08-141-18/+9
* | | Use QScopedPointer wherever possibleHarald Fernengel2009-08-131-13/+19
* | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | Merge commit 'origin/master'Jason Barron2009-08-041-8/+17
|\ \ \
| * | | Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-041-1/+0
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-7/+17
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-17/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Move uninit & readonly into a flags member of QX11PixmapDataTom Cooksey2009-07-291-2/+2