summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Added new mouse cursor types.Denis Dzyubenko2010-02-052-10/+18
* doc: Fixed some qdoc warnings.Martin Smith2010-02-041-4/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-012-4/+20
|\
| * Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-012-4/+20
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-1/+1
|\ \ | |/ |/|
| * Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-40/+9
|\ \
| * \ Merge remote branch 'origin/master'Olivier Goffart2010-01-0811-161/+437
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-40/+9
| |\ \ \
| | * | | Character spacing when drawing a QPicture to a high DPI device.Trond Kjernåsen2009-11-131-40/+9
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-131-2/+5
| | |\ \ \
* | | \ \ \ 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-2064-66/+66
| |\ \ \ \ \
| * | | | | | Fixed QBitmap::load to load into bitmap format again.Gunnar Sletta2010-01-201-7/+14
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-182-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
| * | | | | | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-1364-64/+64
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0864-64/+64
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-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-0764-64/+64
| | |\ \ \ \ \ \
| | | * | | | | | Update copyright year to 2010Jason McDonald2010-01-0664-64/+64
* | | | | | | | | 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 Macieira2010-01-083-9/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-061-1/+1
| |/ / / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-061-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Set serial number in QX11PixmapData::transformedAnders Bakken2010-01-041-0/+2
| * | | | | doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-051-8/+11
| |/ / / /
* | | | | Add QImage::constBits() and QImage::constScanLine()Rhys Weatherley2010-01-062-2/+40
* | | | | Merge branch '4.6'Thiago Macieira2010-01-054-21/+30
|\ \ \ \ \ | |/ / / /
| * | | | Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2009-12-291-1/+1
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-272-19/+28
| |\ \ \ \
| | * | | | Docs: Amendments to latest changes to QImageReader docs.Andreas Aardal Hanssen2009-12-231-17/+16
| | * | | | images: Document QImageReader::loopCount behaviour for infinite loopsHolger Hans Peter Freyther2009-12-231-8/+14
| | * | | | png: Avoid calling QImage::scanLine(int) from within a loopHolger Hans Peter Freyther2009-12-231-1/+4
| | * | | | QImageReader: Avoid errorString creation in the normal caseHolger Hans Peter Freyther2009-12-231-1/+2
| * | | | | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-261-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use Mono instead of MonoLSB when writing pbm files.Rhys Weatherley2009-12-231-1/+1
| | * | | | Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-10-271-0/+1
| | * | | | Update license headers again.Jason McDonald2009-09-0856-224/+224
| | * | | | Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-09-041-0/+1
* | | | | | Merge branch '4.6'Thiago Macieira2009-12-264-129/+353
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fixing compile error on armccAleksandar Sasha Babic2009-12-211-18/+18
| * | | | Fixed QPixmap::load() to not modify referenced copies.Trond Kjernåsen2009-12-181-5/+4
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-162-63/+46
| |\ \ \ \
| | * | | | Fix for QTBUG-4908 SVG transparency rendering problem.Jani Hautakangas2009-12-162-63/+40
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-163-0/+13
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-111-5/+6
| | |\ \ \ \ \
| | * | | | | | Access to image needs to be protected in QS60PixmapDataMiikka Heikkinen2009-12-091-0/+6