| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 1 | -1/+32 |
|\ |
|
| * | Add missing freeTexture() from fix for QTBUG-19180 | Jani Hautakangas | 2011-06-09 | 1 | -0/+6 |
|
|
| * | Simplify texture pooling logic in GL graphics system. | Jani Hautakangas | 2011-06-09 | 1 | -1/+26 |
|
|
| * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
|
|
* | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
|
|
* | | Support gamma correction of text on GL | Eskil Abrahamsen Blomfeldt | 2011-05-03 | 1 | -1/+2 |
|
|
* | | Made extension resolving work with Core profile. | Samuel Rødal | 2011-04-05 | 1 | -29/+15 |
|
|
* | | QGLContext on EGL gets an additional QEglProperties static field applied to e... | Michael Dominic K | 2011-04-01 | 1 | -0/+3 |
|
|
* | | Reset GL glyph cache when texture limit is reached | Eskil Abrahamsen Blomfeldt | 2011-03-23 | 1 | -0/+1 |
|
|
* | | Optimized glyph uploads in GL texture cache. | Samuel Rødal | 2011-03-21 | 1 | -0/+3 |
|
|
* | | Merge branch 'master' into lighthouse-master | Jørgen Lind | 2011-01-26 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
|
|
* | | | Make QGLContext::fromPlatformGLContext show correct sharing | Jørgen Lind | 2011-01-25 | 1 | -0/+1 |
|/ / |
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Add work around for bug when painting w/glTexSubImage into large texture | Eskil Abrahamsen Blomfeldt | 2010-12-16 | 1 | -0/+1 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Gunnar Sletta | 2010-11-29 | 1 | -1/+2 |
|\ \ |
|
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 1 | -1/+2 |
| |\ \
| | |/ |
|
| | * | Fixed crash when destroying QGLWidget | Thorbjørn Lindeijer | 2010-11-17 | 1 | -1/+2 |
|
|
* | | | --warn | Gunnar Sletta | 2010-11-24 | 1 | -0/+1 |
|/ / |
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 1 | -24/+56 |
|\ \
| |/ |
|
| * | Prevented race condition on texture destruction. | Samuel Rødal | 2010-11-08 | 1 | -10/+20 |
|
|
| * | Prevented threading related crash in OpenGL module. | Samuel Rødal | 2010-10-29 | 1 | -23/+45 |
|
|
* | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 1 | -2/+4 |
|\ \ |
|
| * \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Added support for blitting to native child widgets in GL window surface. | Samuel Rødal | 2010-10-22 | 1 | -1/+1 |
|
|
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 1 | -1/+3 |
| |\ \
| | |/ |
|
| | * | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection. | Jani Hautakangas | 2010-10-20 | 1 | -1/+3 |
|
|
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 1 | -2/+1 |
|\ \ \
| |/ / |
|
| * | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-12 | 1 | -2/+1 |
| |\ \
| | |/ |
|
| | * | Revert "Don't define highp/mediump/lowp if desktop GL has them" | Trond Kjernåsen | 2010-10-12 | 1 | -2/+1 |
|
|
| * | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 1 | -0/+3 |
| |\ \
| | |/ |
|
| | * | Don't disable texture_from_pixmap on GLX/X11 by default. | Trond Kjernåsen | 2010-09-27 | 1 | -0/+3 |
|
|
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 1 | -3/+0 |
| |\ \
| | |/ |
|
| | * | Don't try to use the texture_from_pixmap extension in GL on desktop/X11. | Trond Kjernåsen | 2010-09-23 | 1 | -3/+0 |
|
|
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 1 | -1/+2 |
|\ \ \
| |/ / |
|
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 1 | -1/+2 |
| |\ \
| | |/ |
|
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-08-26 | 1 | -1/+2 |
| | |\ |
|
| | | * | Don't define highp/mediump/lowp if desktop GL has them | Rhys Weatherley | 2010-08-13 | 1 | -1/+2 |
|
|
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -1/+1 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-26 | 1 | -1/+8 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
* | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -1/+8 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -1/+11 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Introduce QtOpenGL module for Symbian. | Jani Hautakangas | 2010-08-20 | 1 | -1/+8 |
|
|
* | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -0/+3 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 1 | -0/+3 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Prevented Xorg crash in qtdemo when running corkboards example. | Samuel Rødal | 2010-08-17 | 1 | -0/+3 |
|
|
* | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 1 | -3/+14 |
|\ \ \ \ \
| |/ / / /
| | | / /
| |_|/ /
|/| | | |
|
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 1 | -2/+3 |
| |\ \ \
| | |/ / |
|
| * | | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 1 | -3/+3 |
|
|