Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 38 | -625/+5264 |
|\ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix off-by-one error in mipmap count when loading PVRTC files | Rhys Weatherley | 2010-02-24 | 1 | -1/+1 |
| * | | Remove comment in drawStaticTextItem() in GL engine | Eskil Abrahamsen Blomfeldt | 2010-02-24 | 1 | -1/+0 |
| * | | Made the qDrawPixmaps() API public (with modifications). | Trond Kjernåsen | 2010-02-23 | 2 | -25/+29 |
| * | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 10 | -84/+333 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-19 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 4 | -10/+9 |
| | | |\ \ | |||||
| | | * | | | MOBILITY-404 QS Windows. | Wolfgang Beck | 2010-02-16 | 1 | -1/+3 |
| | * | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-18 | 4 | -10/+9 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Fix warnings on gcc | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 1 | -2/+2 |
| | * | | | | Add experimental VBO support for drawCachedGlyphs()'s index array | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 2 | -1/+32 |
| | * | | | | Optimization for text drawing on OpenGL | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 2 | -2/+8 |
| | * | | | | Some threading improvements to the GL module | Gunnar Sletta | 2010-02-17 | 3 | -18/+56 |
| | * | | | | Fix alpha check for OpenGL/ES in GL2 paint engine | Rhys Weatherley | 2010-02-15 | 1 | -0/+4 |
| | * | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 2 | -2/+13 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 25 | -448/+4823 |
| | |\ \ \ \ | |||||
| | * | | | | | 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 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | 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 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| | * | | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPU | Eskil Abrahamsen Blomfeldt | 2010-01-29 | 1 | -10/+82 |
| | * | | | | | | | | Inline QGL2PEXVertexArray::addRect() | Eskil Abrahamsen Blomfeldt | 2010-01-19 | 2 | -16/+15 |
| | * | | | | | | | | Optimize speed of QGL2PEXVertexArray | Eskil Abrahamsen Blomfeldt | 2010-01-19 | 1 | -2/+11 |
| | * | | | | | | | | Compile | Eskil Abrahamsen Blomfeldt | 2010-01-15 | 3 | -20/+5 |
| | * | | | | | | | | Compile | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -2/+17 |
| | * | | | | | | | | Implement drawStaticTextItem() in OpenGL paint engines | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 4 | -54/+101 |
| | * | | | | | | | | Support transformations in drawStaticText() and optimize for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+1 |
| | * | | | | | | | | Optimize QStaticText for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+1 |
| * | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix building in a namespace on Windows | Andy Shaw | 2010-02-19 | 1 | -1/+3 |
| * | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 4 | -10/+9 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix copyright year. | Jason McDonald | 2010-02-16 | 2 | -2/+2 |
| | * | | | | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 2 | -7/+6 |
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | |