Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ | |||||
| | * \ | 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 |
* | | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 15 | -64/+63 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed a GLX warning that occured with some Intel chipsets under X11. | Trond Kjernåsen | 2010-02-15 | 1 | -2/+5 |
| * | | | | Cleanup QEglContext & EGLDisplays | Tom Cooksey | 2010-02-12 | 5 | -35/+12 |
| * | | | | Moved 'hasAlpha' property from GL2 engine to GL paint device. | Kim Motoyoshi Kalland | 2010-02-12 | 8 | -24/+23 |
| * | | | | Fix several bugs with GL texture cache | Tom Cooksey | 2010-02-12 | 2 | -25/+23 |
| * | | | | Compile fix for OpenGL ES. | Kim Motoyoshi Kalland | 2010-02-12 | 1 | -1/+5 |
| * | | | | Turned off subpixel AA text on surface with alpha in GL2 engine. | Kim Motoyoshi Kalland | 2010-02-12 | 2 | -7/+25 |
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 6 | -14/+274 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 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 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 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 '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 |
* | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 4 | -35/+33 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | 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 |
| | * | | | 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 |
| * | | | | Fix missing namespace. | ck | 2010-02-01 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | 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 |
|\ \ \ \ |