Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 25 | -434/+4549 |
|\ | |||||
| * | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 4 | -35/+33 |
| |\ | |||||
| * \ | 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 |
| * | | | | | | | GCC doesn't like comment lines ending in \ | Thiago Macieira | 2010-01-06 | 1 | -28/+28 |
| * | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-05 | 5 | -172/+195 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed QGLFormat::operator== to handle new fields. | Kim Motoyoshi Kalland | 2010-01-04 | 1 | -3/+13 |
| * | | | | | | | | Added support for OpenGL up to version 3.2 on Windows. | Kim Motoyoshi Kalland | 2009-12-30 | 4 | -25/+275 |
| * | | | | | | | | Format qOpenGLVersionFlagsFromString() according to Qt coding style. | Kim Motoyoshi Kalland | 2009-12-30 | 1 | -22/+16 |
| * | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 16 | -822/+573 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed memory leak in caching of concave paths in GL2 engine. | Kim Motoyoshi Kalland | 2009-12-17 | 1 | -18/+21 |
| * | | | | | | | | | Implemented caching of concave vector paths in the GL2 engine. | Kim Motoyoshi Kalland | 2009-12-15 | 2 | -26/+130 |
| * | | | | | | | | | Added missing OpenGL defines. | Kim Motoyoshi Kalland | 2009-12-15 | 1 | -0/+14 |
| * | | | | | | | | | Fixed integer overflow in QTriangulator. | Kim Motoyoshi Kalland | 2009-12-15 | 1 | -6/+6 |
| * | | | | | | | | | Fixed QGL2PEXVertexArray to interpolate within the range [0, 1]. | Kim Motoyoshi Kalland | 2009-12-15 | 1 | -1/+1 |
| * | | | | | | | | | 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 |
* | | | | | | | | | | | | | | 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 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 |