summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Avoid image conversion in fromSymbianCFbsBitmap for certain formats.Laszlo Agocs2011-03-101-0/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-091-1/+1
| |\ \ \ \
| * | | | | Added native image handle provider header.Laszlo Agocs2011-03-081-0/+69
| * | | | | Added native image handle provider support in pixmaps on openvg.Laszlo Agocs2011-03-082-2/+4
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-081-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-0/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-0/+3
| |\ \ \ | | |/ /
| | * | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-0/+3
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-037-3/+1114
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| * | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-013-5/+7
| |\ \
| * | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-287-3/+1116
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-181-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-104-4/+35
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-092-0/+29
| |\ \ \ | | | |/ | | |/|
| | * | Fix build failureGareth Stockwell2011-02-092-6/+6
| | * | Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-092-0/+29
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-081-0/+2
| |\ \
| | * | Don't crash when BMP color table is brokenHarald Fernengel2011-02-041-0/+2
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-2/+8
| |\ \ | | |/
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1375-77/+77
| |\ \
| * \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-152-8/+28
| |\ \ \
| * \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-34/+47
| |\ \ \ \