summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-251-1/+32
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-231-1/+32
| |\
| | * Fix problem with grabWindow on Mac OS X 10.6 with CocoaAndy Shaw2011-08-221-3/+2
| | * Fix compile issue with Mac OS X 10.5Andy Shaw2011-08-191-2/+8
| | * Fix QPixmap::grabWindow() on Mac OS X LionAndy Shaw2011-08-191-1/+27
* | | Fix compilation of qjpeg on MinGW with GCC 4.6Thiago Macieira2011-08-191-0/+5
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-011-9/+55
|\ \
| * | Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-221-9/+55
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-221-5/+8
|\ \ \ | |/ / |/| / | |/
| * Fixed crash when loading 16 bits-per-pixel grayscale TIFs.Kim Motoyoshi Kalland2011-07-201-11/+20
* | Fixed regression in compilerwarnings.Samuel Rødal2011-07-151-3/+1
* | Deprecate some QPixmap functions (marked as obsolete already).Samuel Rødal2011-07-121-3/+7
* | Deprecate some functions in QImage (that have been obsolete since 4.1).Samuel Rødal2011-07-121-7/+10
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2411-75/+111
|\|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+1
| |\
| * | Improving warning messages in QVolatileImage.Laszlo Agocs2011-06-161-9/+18
| * | Proper naming for raster pixmap and paintengine on Symbian.Laszlo Agocs2011-06-167-55/+54
| * | Handle QVolatileImage-backed pixmaps optimally in drawPixmap().Laszlo Agocs2011-06-165-13/+38
* | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-0/+5
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-091-0/+5
| |\|
| | * Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-091-0/+5
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-1/+1
|\ \ \
| * | | Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-061-1/+1
| |\| |
| | * | Avoid buffer overrun in QMacPixmapData resizingJiang Jiang2011-05-311-1/+1
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1781-1378/+1378
| | |\
| | | * Update licenseheader text in source filesJyri Tahtela2011-05-1381-1378/+1378
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2484-1432/+1443
|\| | |
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-183-2/+13
| |\ \ \
| | * \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-182-0/+4
| | |\ \ \
| | | * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-112-0/+4
| | | |\| |
| | | | * | Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-092-0/+4
| | | | |/
| | * | / Fix QGLWidget::renderPixmap for raster engine on MacJiang Jiang2011-05-111-2/+9
| | |/ /
| * / / Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1384-1430/+1430
| |/ /
* / / Doc: Fixed qdoc warnings.David Boddie2011-05-111-3/+4
|/ /
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-022-0/+6
|\|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-04-282-0/+6
| |\
| * | Upload VGImage data when drawing pixmaps that are being painted into.Laszlo Agocs2011-04-272-0/+6
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-291-6/+2
|\ \ \
| * | | Removed warning from QPixmap::handle().Samuel Rødal2011-04-261-6/+2
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-271-3/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-3/+1
| |\|
| | * Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-261-3/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-0/+6
|\| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-2311-22/+1205
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2211-22/+1205
| | |\ \
| * | | | Doc: Small update to QImageReader/Writer::supportedImageFomrmats()Geir Vattekar2011-03-232-0/+6
| |/ / /
* | | | Fixed compilation of qpixmap_raster.cppSamuel Rødal2011-04-051-1/+2
* | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-056-15/+5
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-042-5/+12
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-5/+12
| |\ \ \ \ | | | |_|/ | | |/| |