Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | | | | | | Export QGLContextResource for use with Qt/3D | Rhys Weatherley | 2010-03-29 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Worked around driver bug causing clipping errors on N900. | Samuel Rødal | 2010-03-10 | 1 | -3/+8 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Fixed an exit crash that could occur in the GL 2 engine under X11. | Trond Kjernåsen | 2010-03-04 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | Preparation to enable OpenGLES 2.0 for Windows Mobile. | ninerider | 2010-02-27 | 1 | -3/+9 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Fix off-by-one error in mipmap count when loading PVRTC files | Rhys Weatherley | 2010-02-24 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Fix building in a namespace on Windows | Andy Shaw | 2010-02-19 | 1 | -1/+3 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | 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 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | 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 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |