| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 11 | -105/+252 |
|\ |
|
| * | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 5 | -14/+51 |
| |\ |
|
| | * | Work around an ATI driver problem with mutli-sampled pbuffers. | Trond Kjernåsen | 2010-09-28 | 1 | -11/+18 |
|
|
| | * | Don't disable texture_from_pixmap on GLX/X11 by default. | Trond Kjernåsen | 2010-09-27 | 2 | -7/+29 |
|
|
| | * | Don't pretend to support single buffered EGL surfaces. | Trond Kjernåsen | 2010-09-24 | 2 | -0/+4 |
|
|
| | * | Named anonymous struct in the OpenGL paint engine. | Kim Motoyoshi Kalland | 2010-09-24 | 1 | -2/+2 |
|
|
| * | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 4 | -27/+78 |
| |\ \ |
|
| | * | | Fallback to A8 text rendering on Mac when LCD smoothing is disabled | Aaron Kennedy | 2010-09-29 | 1 | -0/+7 |
|
|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-09-28 | 6 | -88/+92 |
| | |\ \
| | | |/ |
|
| | * | | Minimize parameter changes on glyph cache textures | Aaron Kennedy | 2010-09-28 | 3 | -5/+32 |
|
|
| | * | | Only set maskTexture sampler uniform once | Aaron Kennedy | 2010-09-28 | 2 | -6/+13 |
|
|
| | * | | Only repopulate the glyph cache when we know something could have changed | Aaron Kennedy | 2010-09-28 | 1 | -11/+16 |
|
|
| | * | | Remove unnecessary attribute changes | Aaron Kennedy | 2010-09-23 | 1 | -2/+0 |
|
|
| | * | | Invalidate QStaticText coord cache when texture size changes | Aaron Kennedy | 2010-09-23 | 1 | -1/+8 |
|
|
| * | | | Make texture glyph cache on OpenGL work without a paint engine | Eskil Abrahamsen Blomfeldt | 2010-09-29 | 2 | -12/+67 |
|
|
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 6 | -88/+92 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Don't try to use the texture_from_pixmap extension in GL on desktop/X11. | Trond Kjernåsen | 2010-09-23 | 2 | -29/+7 |
|
|
| | * | | Compile on Symbian - rework the X11 mask patch a bit. | Trond Kjernåsen | 2010-09-23 | 1 | -2/+2 |
|
|
| | * | | Fix compilation | Olivier Goffart | 2010-09-22 | 1 | -2/+2 |
|
|
| | * | | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. | Trond Kjernåsen | 2010-09-22 | 2 | -1/+5 |
|
|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-09-22 | 3 | -57/+79 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Revert "Fixed painter path drawing on FBO without stencil buffer." | Kim Motoyoshi Kalland | 2010-09-22 | 2 | -30/+0 |
|
|
| | | * | Fixed stencil buffer on FBOs with OpenGL ES. | Kim Motoyoshi Kalland | 2010-09-22 | 2 | -27/+79 |
|
|
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 12 | -30/+110 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix problems in QTextureGlyphCache caused by insufficient merge | Eskil Abrahamsen Blomfeldt | 2010-09-24 | 1 | -2/+8 |
|
|
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 4 | -3/+17 |
| |\ \ \
| | |/ / |
|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-09-22 | 1 | -0/+1 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | remove extra includes | Ritt Konstantin | 2010-09-21 | 1 | -0/+1 |
|
|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-09-22 | 2 | -1/+12 |
| | |\ \ |
|
| | | * | | Fixed drawing a large number of glyphs with the same font under GL. | Trond Kjernåsen | 2010-09-21 | 2 | -1/+12 |
| | | |/ |
|
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-09-21 | 1 | -3/+5 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Prevent crash in QGLGlyphCache due to dangling context references. | Samuel Rødal | 2010-09-14 | 1 | -3/+5 |
|
|
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 8 | -19/+73 |
| |\ \ \
| | |/ / |
|
| | * | | Fixed painter path drawing on FBO without stencil buffer. | Kim Motoyoshi Kalland | 2010-09-20 | 2 | -0/+30 |
|
|
| | * | | Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). | Yoann Lopes | 2010-09-20 | 2 | -0/+2 |
|
|
| | * | | Support multisampled pbuffers under Windows. | Trond Kjernåsen | 2010-09-20 | 2 | -14/+28 |
|
|
| | * | | Prevented crash in GL window surface when deleting native child widgets. | Samuel Rødal | 2010-09-10 | 1 | -4/+8 |
|
|
| | * | | Fixed compilation and API of meego graphics system. | Samuel Rødal | 2010-09-10 | 1 | -0/+1 |
|
|
| | * | | Don't waste memory on the share widget in the GL window surface. | Samuel Rødal | 2010-09-10 | 1 | -1/+4 |
|
|
| * | | | Fixes makeCurrent() failed messages on several systems. | Trond Kjernåsen | 2010-09-16 | 1 | -3/+2 |
|
|
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-09-10 | 3 | -5/+12 |
| |\ \ \ |
|
| | * | | | Support sub pixel positioning of glyphs in raster engine | Eskil Abrahamsen Blomfeldt | 2010-09-09 | 3 | -5/+12 |
|
|
* | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 12 | -25/+191 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 7 | -15/+78 |
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | * | | Make sure we blit to the correct FBO in the GL window surface. | Samuel Rødal | 2010-09-09 | 1 | -1/+5 |
|
|
| | * | | Some optimizations to the GL pixmap data. | Samuel Rødal | 2010-09-09 | 4 | -6/+44 |
|
|
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-09-07 | 1 | -0/+2 |
| | |\ \
| | | |/ |
|
| | | * | Recognize GL_ARB_shader_objects as indicating shaders | Rhys Weatherley | 2010-08-27 | 1 | -0/+2 |
|
|
| | * | | Ensure that OpenGL contexts are attached to an NSView before first paint | Tor Arne Vestbø | 2010-09-02 | 1 | -3/+11 |
|
|
| | * | | Clear the QGLWindowSurface in ::beginPaint when needed. | Michael Dominic K | 2010-08-31 | 1 | -0/+14 |
|
|