Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 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 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Fixed Mac OS X compile time error by using GLint for temp. | Martin Smith | 2010-02-11 | 1 | -1/+1 |
* | | | | | 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 remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 6 | -14/+274 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 5 | -5/+17 |
| |\ \ \ \ | |||||
| | * | | | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens. | Trond Kjernåsen | 2010-02-10 | 1 | -1/+5 |
| | * | | | | Fixed drawing QPixmaps on QGLWidgets on different X11 screens. | Trond Kjernåsen | 2010-02-10 | 1 | -1/+8 |
* | | | | | | 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 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Turned off subpixel AA text on surface with alpha in GL2 engine. | Kim Motoyoshi Kalland | 2010-02-11 | 2 | -7/+25 |
| * | | | | | Changed a couple of GL defines from decimal to hex. | Kim Motoyoshi Kalland | 2010-02-11 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Added \since 4.7 tags | Gunnar Sletta | 2010-02-10 | 1 | -0/+14 |
| | |_|/ | |/| | | |||||
| * | | | Added geometry shaders to changes-4.7.0 file + a small doc update about it | Gunnar Sletta | 2010-02-10 | 1 | -0/+2 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Gunnar Sletta | 2010-02-10 | 4 | -35/+33 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 4 | -35/+33 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'geometry-shaders-to-integrate' | Gunnar Sletta | 2010-02-08 | 4 | -5/+231 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Another round of Geometry shader review. | Gunnar Sletta | 2010-02-08 | 2 | -21/+13 |
| | * | | | Fix Geometry shaders based on review | Gunnar Sletta | 2010-02-04 | 2 | -10/+16 |
| | * | | | Geometry Shader support in QGLShaderProgram | Gunnar Sletta | 2010-02-01 | 4 | -1/+228 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-05 | 1 | -14/+16 |
| |\ \ \ \ | |||||
| | * | | | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -14/+16 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-05 | 2 | -0/+39 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Add QMacCompatGLenum overrides for new QGLShaderProgram functions | Rhys Weatherley | 2010-02-05 | 2 | -0/+39 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-04 | 1 | -6/+8 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-04 | 1 | -6/+8 |
| * | | | | | Fixed wrong variable name | Gabriel de Dietrich | 2010-02-04 | 1 | -1/+1 |
| * | | | | | Improvements to the QGLShaderProgram API | Rhys Weatherley | 2010-02-04 | 2 | -0/+196 |
| * | | | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) support | Rhys Weatherley | 2010-02-04 | 15 | -343/+156 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-01 | 5 | -15/+621 |
| |\ \ \ \ | |||||
| | * | | | | Placate pedantic compiler warning modes on QGLBuffer | Rhys Weatherley | 2010-02-01 | 2 | -15/+15 |
| | * | | | | Add the QGLBuffer class to Qt 4.7 for VBO's | Rhys Weatherley | 2010-02-01 | 5 | -15/+621 |
| | |/ / / | |||||
| * | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 8 | -358/+443 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fixed compile of QTriangulator on Solaris. | Kim Motoyoshi Kalland | 2010-01-26 | 1 | -5/+7 |
| * | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 5 | -13/+60 |
| |\ \ \ \ | |||||
| * | | | | | Updated painter path caching in the GL2 engine after merge. | Kim Motoyoshi Kalland | 2010-01-19 | 1 | -3/+2 |
| * | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 15 | -434/+475 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 67 | -110/+162 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp. | ck | 2010-01-11 | 1 | -0/+4 |
| * | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 18 | -507/+719 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix compilation breakage caused by merge. | Thiago Macieira | 2010-01-06 | 1 | -1/+1 |
| * | | | | | | | | Change from std::pair to QPair. | Thiago Macieira | 2010-01-06 | 1 | -8/+8 |