summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Add private qt_draw_glyphs() APIEskil Abrahamsen Blomfeldt2010-02-231-1/+4
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-2/+2
|\
| * Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-1/+2
| |\
| * \ Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-153-13/+46
| |\ \
| | * \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-158-132/+156
| | |\ \
| * | | | Update license doc and .pri file for libpng 1.4.0aavit2010-02-151-2/+2
| | |/ / | |/| |
* | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-173-8/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix several bugs with GL texture cacheTom Cooksey2010-02-122-4/+20
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-02-111-1/+2
| |\ \ \
| * | | | document the slowness of QPixmap::hasAlpha()Gunnar Sletta2010-02-111-4/+5
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-74/+63
|\ \ \ \ | | |_|/ | |/| |
| * | | Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-101-73/+62
| |\ \ \
| | * | | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-14/+48
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| | |/ | |/|
| * | Fixed some global QIcon/QPixmap instances that leaked handles on X11.Trond Kjernåsen2010-02-091-5/+12
| * | Fixed warnings and crash when painting graphics effects outside scene.Yoann Lopes2010-02-091-0/+14
| * | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-081-8/+20
* | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-106-31/+57
|\ \ \
| * \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-096-31/+57
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fixed a crash when QPixmaps are destroyed after the ~QApplication.Trond Kjernåsen2010-01-291-1/+6
| | * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-296-30/+51
* | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
generated by cgit v0.12 at 2024-11-15 00:52:56 (GMT)