Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make bindTextureFromNativePixmap use new QEgl APIs | Tom Cooksey | 2010-03-02 | 2 | -6/+7 |
* | Move QGLWidget::setContext logic into QEgl & QGLContext | Tom Cooksey | 2010-03-02 | 1 | -0/+1 |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 1 | -1/+1 |
|\ | |||||
| * | Fixed translucent window rendering on 16 bit X11. | Samuel Rødal | 2010-02-24 | 1 | -1/+1 |
* | | Add private qt_draw_glyphs() API | Eskil Abrahamsen Blomfeldt | 2010-02-23 | 1 | -1/+4 |
* | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 1 | -1/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 3 | -13/+46 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 8 | -132/+156 |
| | |\ \ \ | |||||
| * | | | | | Update license doc and .pri file for libpng 1.4.0 | aavit | 2010-02-15 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 3 | -8/+25 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Fix several bugs with GL texture cache | Tom Cooksey | 2010-02-12 | 2 | -4/+20 |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-02-11 | 1 | -1/+2 |
| |\ \ \ | |||||
| * | | | | document the slowness of QPixmap::hasAlpha() | Gunnar Sletta | 2010-02-11 | 1 | -4/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -74/+63 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Workaround for a certain functionally challenged compiler | aavit | 2010-02-10 | 1 | -3/+3 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-10 | 1 | -73/+62 |
| |\ \ \ | |||||
| | * | | | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. | aavit | 2010-02-09 | 1 | -73/+62 |
* | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 3 | -14/+48 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Prevented assert when using drop shadow effect in the GL 2 engine. | Samuel Rødal | 2010-02-10 | 1 | -1/+2 |
| | |/ | |/| | |||||
| * | | Fixed some global QIcon/QPixmap instances that leaked handles on X11. | Trond Kjernåsen | 2010-02-09 | 1 | -5/+12 |
| * | | Fixed warnings and crash when painting graphics effects outside scene. | Yoann Lopes | 2010-02-09 | 1 | -0/+14 |
| * | | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. | Trond Kjernåsen | 2010-02-08 | 1 | -8/+20 |
* | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-10 | 6 | -31/+57 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 6 | -31/+57 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fixed a crash when QPixmaps are destroyed after the ~QApplication. | Trond Kjernåsen | 2010-01-29 | 1 | -1/+6 |
| | * | Fix GL texture leaks when pixmaps are deleted | Tom Cooksey | 2010-01-29 | 6 | -30/+51 |
* | | | Added new mouse cursor types. | Denis Dzyubenko | 2010-02-05 | 2 | -10/+18 |
|/ / | |||||
* | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-04 | 1 | -4/+5 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-01 | 2 | -4/+20 |
|\ \ | |||||
| * | | Promote QPixmap::convertFromImage() to public API from Qt3Support | Rhys Weatherley | 2010-02-01 | 2 | -4/+20 |
* | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fixed an infinite loop that could occur when reading invalid BMP images. | Trond Kjernåsen | 2010-01-26 | 1 | -1/+1 |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma... | Pulse Build System | 2010-01-22 | 1 | -40/+9 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/master' | Olivier Goffart | 2010-01-08 | 11 | -161/+437 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Bill King | 2009-12-16 | 1 | -40/+9 |
| |\ \ \ | |||||
| | * | | | Character spacing when drawing a QPicture to a high DPI device. | Trond Kjernåsen | 2009-11-13 | 1 | -40/+9 |
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2009-11-13 | 1 | -2/+5 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 1 | -7/+14 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-01-20 | 64 | -66/+66 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed QBitmap::load to load into bitmap format again. | Gunnar Sletta | 2010-01-20 | 1 | -7/+14 |
* | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Avoid an unnecessary copy in QImage::scaled(). | Trond Kjernåsen | 2010-01-15 | 1 | -1/+1 |
| * | | | | | | Removed pointless image comparison in raster colorize filter. | Samuel Rødal | 2010-01-13 | 1 | -1/+1 |
* | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 64 | -64/+64 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-08 | 64 | -64/+64 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2010-01-08 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-07 | 64 | -64/+64 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 64 | -64/+64 |
* | | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | |