Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-19 | 1 | -5/+0 |
|\ | |||||
| * | Remove driver bug work-around from GL 2 paint engine. | Samuel Rødal | 2010-11-12 | 1 | -5/+0 |
* | | Fix compilation after merge. | Olivier Goffart | 2010-11-12 | 1 | -1/+1 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 10 | -47/+96 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Make operator QRectF const | Harald Fernengel | 2010-11-09 | 1 | -1/+1 |
| * | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 4 | -5/+5 |
| * | | Prevented race condition on texture destruction. | Samuel Rødal | 2010-11-08 | 3 | -10/+32 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 4 | -40/+67 |
| |\ \ | | |/ | |/| | |||||
| | * | Prevented threading related crash in OpenGL module. | Samuel Rødal | 2010-10-29 | 2 | -24/+51 |
| | * | Fix possible crash in QStaticText and QDeclarativeTextLayout | Eskil Abrahamsen Blomfeldt | 2010-10-29 | 2 | -16/+16 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Prevent access to non-existent memory in QGL2PEXVertexArray | Topi Reiniö | 2010-11-04 | 1 | -2/+3 |
| |/ | |||||
* | | Merge branch 'lancelot' | aavit | 2010-11-02 | 3 | -8/+11 |
|\ \ | |||||
| * | | Fixes unstability caused by a dangling pointer in GL text rendering | Trond Kjernåsen | 2010-10-27 | 3 | -8/+11 |
| * | | Revert "Don't define highp/mediump/lowp if desktop GL has them" | Trond Kjernåsen | 2010-10-12 | 3 | -13/+3 |
* | | | Fixed index type after reapplying commit 89cbb165. | Kim Motoyoshi Kalland | 2010-11-02 | 1 | -1/+4 |
* | | | Reapply "Fixed painter path drawing on FBO without stencil buffer." | Kim Motoyoshi Kalland | 2010-11-02 | 2 | -0/+30 |
* | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 8 | -21/+505 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 15 | -113/+142 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 10 | -186/+378 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 11 | -105/+252 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 12 | -30/+110 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 12 | -25/+191 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Compile fix | Paul Olav Tvete | 2010-09-03 | 1 | -0/+3 |
| * | | | | | | | | 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 | 8 | -24/+467 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 9 | -27/+474 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 3 | -6/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 9 | -12/+65 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Revert "Allow customizing the default fbo from the QPlatformGLContext." | Jørgen Lind | 2010-08-11 | 2 | -7/+0 |
| | * | | | | | | | | | | | Added reduced config to glxconfig | Jørgen Lind | 2010-08-06 | 1 | -4/+10 |
| | * | | | | | | | | | | | Add missing null check to lighthouse's QGLTemporaryContext. | Christian Kamm | 2010-08-06 | 1 | -2/+4 |
| | * | | | | | | | | | | | Fixed Lighthouse tempcontext to reset to current context | Jørgen Lind | 2010-08-06 | 1 | -5/+8 |
| | * | | | | | | | | | | | Allow customizing the default fbo from the QPlatformGLContext. | Christian Kamm | 2010-08-06 | 2 | -0/+7 |
| | * | | | | | | | | | | | Make the GLX integration give more correct format | Jørgen Lind | 2010-08-06 | 1 | -1/+2 |
| * | | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 12 | -11/+6034 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Jørgen Lind | 2010-08-05 | 2 | -9/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Forgot to makeCurrent before QGLWidget::resizeGL in Lighthouse | Jørgen Lind | 2010-08-04 | 1 | -0/+1 |
| | * | | | | | | | | | | | | Make QWidget::setPlatformWindowFormat recreate platformWindow | Jørgen Lind | 2010-08-04 | 1 | -10/+19 |
| | * | | | | | | | | | | | | QGLWindowSurface does not support partialupdates if not EGL is defined | Jørgen Lind | 2010-08-03 | 1 | -0/+2 |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-08-03 | 5 | -14/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Make it possible to view what format a QPlatformGlContext has | Jørgen Lind | 2010-08-03 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | Added QGLFormat to QPlatformWindowFormat conversion | Jørgen Lind | 2010-07-27 | 1 | -4/+66 |
| | * | | | | | | | | | | | | | fix QGLContext::reset in lighthouse | Jørgen Lind | 2010-07-26 | 1 | -2/+4 |
| | * | | | | | | | | | | | | | Make it possible to have shared contexts to Lighthouse | Jørgen Lind | 2010-07-23 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-04 | 5 | -14/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-21 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Less ugly hack to make QtOpenGL compile on Lighthouse | Paul Olav Tvete | 2010-07-21 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 8 | -21/+411 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / |