Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Merge commit 'origin/4.6' | Olivier Goffart | 2009-12-15 | 9 | -277/+697 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-08 | 2 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-12-05 | 4 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-02 | 7 | -228/+381 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Added QTriangulator. | Kim Motoyoshi Kalland | 2009-12-02 | 3 | -2/+3083 | |
* | | | | | | | | | | | | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | Revert 004b09ffd423cd3100e346825dd7d730fc86d366 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -5/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'qstatictext-4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t... | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Make the GL glyph cache a POT texture | Eskil Abrahamsen Blomfeldt | 2010-02-09 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 3 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Kim Motoyoshi Kalland | 2010-02-09 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Fixed bug where GL widget was not fully updated on Vista. | Kim Motoyoshi Kalland | 2010-02-04 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | Add a pixmap modification hook to blur pixmap filter cache | Tom Cooksey | 2010-02-08 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Use glDrawElements and triangle strips to draw glyphs in GL engine | Eskil Abrahamsen Blomfeldt | 2010-02-09 | 3 | -4/+34 | |
* | | | | | | | | | | | | | | | Remove VBO caching and glDrawElements path in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-08 | 1 | -124/+43 | |
* | | | | | | | | | | | | | | | Clean up VBOs cached in QStaticText when context is deleted | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -18/+36 | |
* | | | | | | | | | | | | | | | Add explanatory comment to QGL2PaintEngineExPrivate::drawCachedGlyphs | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | Recreate cached vertex arrays for QStaticText when drawn to new context | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -3/+11 | |
* | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat... | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 3 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-03 | 4 | -35/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Fixed a failure in tst_qgl. | Trond Kjernåsen | 2010-02-02 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | | | Fixed compilation of the GL2 engine for OpenGL ES 2. | Kim Motoyoshi Kalland | 2010-02-02 | 1 | -0/+2 | |
| | * | | | | | | | | | | | | | | Fixed missing textures in the boxes demo. | Kim Motoyoshi Kalland | 2010-02-02 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Fix missing namespace. | ck | 2010-02-01 | 1 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Small optimization for QStaticText when used with index arrays | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 1 | -4/+13 | |
* | | | | | | | | | | | | | | | Fix broken text drawing in OpenGL engine when text items are too long | Eskil Abrahamsen Blomfeldt | 2010-02-02 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | Add experimental support for using drawElements to draw cached text | Eskil Abrahamsen Blomfeldt | 2010-02-02 | 1 | -3/+34 | |
* | | | | | | | | | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 14 | -394/+522 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fixed garbled 3D Qt logo in the overpainting example. | Kim Motoyoshi Kalland | 2010-02-01 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | Fix GL texture leaks when pixmaps are deleted | Tom Cooksey | 2010-01-29 | 3 | -35/+28 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Better support for user-generated binary shaders | Rhys Weatherley | 2010-01-27 | 1 | -3/+35 | |
| * | | | | | | | | | | | | | Added a warning to QGLWidget::renderText(). | Trond Kjernåsen | 2010-01-27 | 1 | -2/+20 | |
| * | | | | | | | | | | | | | Updated docs regarding QGLWidget::renderText() limitations. | Trond Kjernåsen | 2010-01-25 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-01-22 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fix rendering with simple shader in GL2 engine | Tom Cooksey | 2010-01-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | Fix y-inverted pixmaps properly. | Gunnar Sletta | 2010-01-22 | 1 | -9/+5 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Purely cosmetic (formatting) changes to GL2 engine's GLSL | Tom Cooksey | 2010-01-21 | 1 | -333/+357 | |
| * | | | | | | | | | | | | | Use an attribute value for the PMV matrix rather than a uniform | Tom Cooksey | 2010-01-21 | 5 | -31/+42 | |
| * | | | | | | | | | | | | | Remove unnecessary depth uniform from GL2 engine's GLSL | Tom Cooksey | 2010-01-21 | 1 | -6/+0 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-20 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. | Trond Kjernåsen | 2010-01-20 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-19 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix copyright year. | Jason McDonald | 2010-01-19 | 2 | -2/+2 | |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2010-01-19 | 1 | -6/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix X11/EGL builds using OpenGL ES 1.1 | Tom Cooksey | 2010-01-19 | 1 | -6/+45 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Fixed y-inverted pixmaps on N900. | Gunnar Sletta | 2010-01-19 | 1 | -4/+8 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Fix transformed painting of QStaticText in GL2 paint engine | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 2 | -8/+22 | |
* | | | | | | | | | | | | Make QStaticText private API | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 2 | -2/+2 | |
* | | | | | | | | | | | | Compile on Windows | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -0/+8 | |
* | | | | | | | | | | | | Remove reference to _ARB macros | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -9/+9 | |