Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-02 | 2 | -0/+6 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-04-28 | 2 | -0/+6 |
| |\ | |||||
| * | | Upload VGImage data when drawing pixmaps that are being painted into. | Laszlo Agocs | 2011-04-27 | 2 | -0/+6 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-28 | 1 | -6/+2 |
|\ \ \ | |||||
| * | | | Removed warning from QPixmap::handle(). | Samuel Rødal | 2011-04-26 | 1 | -6/+2 |
* | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-26 | 1 | -3/+1 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-04-26 | 1 | -3/+1 |
| |\ \ | | |/ | |||||
| | * | Set QPixmapCache default limit to 10MB on Symbian. | Jani Hautakangas | 2011-04-26 | 1 | -3/+1 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 2 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-03-23 | 11 | -22/+1205 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 11 | -22/+1205 |
| | |\ \ | |||||
| * | | | | Doc: Small update to QImageReader/Writer::supportedImageFomrmats() | Geir Vattekar | 2011-03-23 | 2 | -0/+6 |
| |/ / / | |||||
* | | | | Fixed compilation of qpixmap_raster.cpp | Samuel Rødal | 2011-04-05 | 1 | -1/+2 |
* | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 6 | -15/+5 |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-03 | 2 | -5/+12 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 2 | -5/+12 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 5 | -20/+89 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-03-21 | 2 | -5/+12 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Doc: Fixed reference to absolete API in exceptionsafety.html | Geir Vattekar | 2011-03-17 | 1 | -0/+4 |
| | | * | | Doc: Fixed broken links in QIcon::fromTheme() | Geir Vattekar | 2011-03-17 | 1 | -5/+8 |
* | | | | | Merge branch 'png151' | aavit | 2011-04-01 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Avoid runtime warning about interlace handling from libpng 1.5 | aavit | 2011-03-25 | 1 | -0/+1 |
* | | | | | Fix warning about copy constructor not initialising base explicitly | Thiago Macieira | 2011-03-22 | 1 | -0/+1 |
* | | | | | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-03-22 | 3 | -49/+73 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 3 | -23/+36 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2011-03-18 | 2 | -5/+25 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-17 | 13 | -16/+1204 |
| | | |\ \ \ \ | |||||
| | | * | | | | | qpnghandler: Compile with QT_NO_IMAGE_TEXT. | Morten Johan Sørvig | 2011-03-16 | 1 | -0/+2 |
| | | * | | | | | added capabilites to QPlatformIntegration | Gunnar Sletta | 2011-03-01 | 1 | -0/+9 |
| | | * | | | | | Allow using QPixmap outside GUI thread when using raster | Gunnar Sletta | 2011-03-01 | 1 | -5/+14 |
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-17 | 1 | -18/+11 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Fix for wrong dpi metrics for raster pixmaps on Symbian. | Laszlo Agocs | 2011-03-16 | 1 | -18/+11 |
| * | | | | | | Fixes: some text fields in PNG image files were not read | aavit | 2011-03-17 | 1 | -26/+39 |
| |/ / / / / | |||||
* | | | | | | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 3 | -12/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 2 | -2/+2 |
| * | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-09 | 1 | -10/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removed obsolete documentation from QPixmap. | Samuel Rødal | 2011-03-07 | 1 | -10/+0 |
| | * | | | | | | Fixed auto-test failures caused by a3a79fefe65ec12. | Samuel Rødal | 2011-03-07 | 1 | -2/+5 |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-03-04 | 1 | -0/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fail in a nicer way when QPixmap is used in a non-GUI application. | Samuel Rødal | 2011-03-04 | 1 | -0/+5 |
| | | | |_|/ / / | | | |/| | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 5 | -2/+78 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fix for fromSymbianCFbsBitmap changing the source data unexpectedly. | Laszlo Agocs | 2011-03-10 | 1 | -0/+3 |
| * | | | | | | Avoid image conversion in fromSymbianCFbsBitmap for certain formats. | Laszlo Agocs | 2011-03-10 | 1 | -0/+2 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Added native image handle provider header. | Laszlo Agocs | 2011-03-08 | 1 | -0/+69 |
| * | | | | | | Added native image handle provider support in pixmaps on openvg. | Laszlo Agocs | 2011-03-08 | 2 | -2/+4 |
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | |