summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* 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-172-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
|/ /
* | 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-281-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-261-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-032-5/+12
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-5/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-225-20/+89
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-212-5/+12
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Doc: Fixed reference to absolete API in exceptionsafety.htmlGeir Vattekar2011-03-171-0/+4
| | | * | Doc: Fixed broken links in QIcon::fromTheme()Geir Vattekar2011-03-171-5/+8
* | | | | Merge branch 'png151'aavit2011-04-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avoid runtime warning about interlace handling from libpng 1.5aavit2011-03-251-0/+1
* | | | | Fix warning about copy constructor not initialising base explicitlyThiago Macieira2011-03-221-0/+1
* | | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-223-49/+73
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-213-23/+36
| |\ \ \ \
| | * \ \ \ Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-03-182-5/+25
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1713-16/+1204
| | | |\ \ \ \
| | | * | | | | qpnghandler: Compile with QT_NO_IMAGE_TEXT.Morten Johan Sørvig2011-03-161-0/+2
| | | * | | | | added capabilites to QPlatformIntegrationGunnar Sletta2011-03-011-0/+9
| | | * | | | | Allow using QPixmap outside GUI thread when using rasterGunnar Sletta2011-03-011-5/+14
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-171-18/+11
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-161-18/+11
| * | | | | | Fixes: some text fields in PNG image files were not readaavit2011-03-171-26/+39
| |/ / / / /
* | | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-211-0/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-113-12/+10
|\ \ \ \ \
| * | | | | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-101-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-091-10/+8
| |\ \ \ \ \ \
| | * | | | | | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| | * | | | | | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-041-0/+5
| | |\ \ \ \ \ \
| | | * | | | | | Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-115-2/+78
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.Laszlo Agocs2011-03-101-0/+3