Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' into lighthouse | Paul Olav Tvete | 2009-09-30 | 65 | -492/+1569 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Please welcome the Lighthouse Research Project! | Paul Olav Tvete | 2009-09-07 | 3 | -1/+61 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Reading and writing PNG iTXt international text chunks | aavit | 2010-11-02 | 1 | -27/+31 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: corruption of whitespace in text fields when reading PNG images | aavit | 2010-10-29 | 1 | -19/+5 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures. | Michael Dominic K | 2010-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-12 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Add TIFFClose to QTIffHandler::option() to avoid memory leak | Topi Reiniö | 2010-10-11 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix for CFbsBitmap to QPixmap conversion. | Jani Hautakangas | 2010-10-12 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-09 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Experimental support of the unified toolbar with | Fabien Freling | 2010-10-08 | 1 | -1/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-09 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Avoid in-place convertion of images with multiple references | Benjamin Poulain | 2010-10-08 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-08 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Live texture updates to meegographicssystem plugin. | Michael Dominic K | 2010-10-07 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 3 | -62/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Fixed potential crash when loading corrupt GIFs. | Kim Motoyoshi Kalland | 2010-09-28 | 1 | -2/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | aavit | 2010-09-27 | 2 | -14/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Avoid creating copy of an image in memory when storing as png | aavit | 2010-09-27 | 1 | -47/+45 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Optimization of pixel conversion when storing jpeg | aavit | 2010-09-24 | 1 | -13/+19 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 2 | -14/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Compile on Symbian - rework the X11 mask patch a bit. | Trond Kjernåsen | 2010-09-23 | 5 | -20/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fixed QPixmap::resize() for X11 pixmap with masks. | Trond Kjernåsen | 2010-09-23 | 1 | -9/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. | Trond Kjernåsen | 2010-09-22 | 4 | -1/+17 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 1 | -28/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Avoid creating copy of an image in memory when storing as jpeg | aavit | 2010-09-21 | 1 | -28/+13 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-09-22 | 4 | -18/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 4 | -20/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Fixed infinite loop when loading jpeg without EOI from memory. | Kim Motoyoshi Kalland | 2010-09-20 | 1 | -11/+8 | |
| | * | | | | | | | | | | | | | | | | | | | | | Give a warning in QPixmap::handle() if pixmap is not X11 class. | Samuel Rødal | 2010-09-20 | 1 | -2/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | Fixed memory corruption issue in qt_blurImage for Indexed8 images. | Samuel Rødal | 2010-09-17 | 1 | -4/+11 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Fixed regression in QPixmap::size() for null pixmaps. | Samuel Rødal | 2010-09-16 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 1 | -5/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 2 | -8/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 2 | -2/+53 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling, broken links, and missing default values. | Jerome Pasion | 2010-08-30 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Give a warning in QPixmap::handle() if pixmap is not X11 class. | Samuel Rødal | 2010-09-18 | 1 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Make raster the default graphics system on X11. | Samuel Rødal | 2010-09-17 | 1 | -0/+5 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images | Luboš Luňák | 2010-09-14 | 1 | -2/+5 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 2 | -3/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary function declarations from qpixmap_s60_p.h | Jani Hautakangas | 2010-09-07 | 1 | -5/+0 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Remove unused variable | Thomas Zander | 2010-09-07 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | Make compile on gcce | Thomas Zander | 2010-09-07 | 2 | -7/+10 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | QPixmaps try to access FBS connection after the connection has been closed. | Jani Hautakangas | 2010-09-06 | 2 | -2/+53 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | C++0x move operators | Olivier Goffart | 2010-09-03 | 4 | -0/+17 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Revised fix for pixmap loading | Jens Bache-Wiig | 2010-08-20 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | Fixes a regression preventing loading images without extensions | Thierry Bastian | 2010-08-19 | 1 | -3/+0 | |