Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-12-02 | 2 | -2/+20 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Gunnar Sletta | 2010-11-29 | 7 | -27/+74 | |
| |\ \ | ||||||
| * | | | print out which GLSL shader that failed compilation for better debugging | Gunnar Sletta | 2010-11-28 | 1 | -2/+19 | |
| * | | | --warn | Gunnar Sletta | 2010-11-24 | 1 | -0/+1 | |
* | | | | Merge remote branch 'origin/master' into lighthouse-master | Jørgen Lind | 2010-11-29 | 8 | -32/+74 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Added mipmap property to QGLFramebufferObjectFormat. | Kim Motoyoshi Kalland | 2010-11-26 | 3 | -7/+49 | |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 4 | -20/+25 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | Fix a build break when namespace is defined | Miikka Heikkinen | 2010-11-22 | 1 | -17/+17 | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-19 | 1 | -17/+17 | |
| | |\ | ||||||
| | | * | Fix for QtOpenGL RVCT4 compilation error | Jani Hautakangas | 2010-11-18 | 1 | -17/+17 | |
| | * | | Fix possible corrupted text when gl glyph cache becomes full | Eskil Abrahamsen Blomfeldt | 2010-11-19 | 3 | -3/+27 | |
| | * | | Fixed crash when destroying QGLWidget | Thorbjørn Lindeijer | 2010-11-17 | 1 | -1/+2 | |
| | * | | Prevent crash in GL 2 engine when stroking null rectangle. | Samuel Rødal | 2010-11-17 | 1 | -0/+3 | |
| | * | | Fix possible missing glyphs in text when using GL engine | Eskil Abrahamsen Blomfeldt | 2010-11-16 | 3 | -2/+24 | |
| | |/ | ||||||
| * | | 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 | |
* | | | Make QtOpenGL use shared contextexts on Lighthouse | Jørgen Lind | 2010-11-26 | 6 | -36/+89 | |
* | | | Move the Lighthouse specfic api into qpa_qpa.cpp | Jørgen Lind | 2010-11-26 | 3 | -12/+22 | |
* | | | Lighthouse: Fix QGLContext::currentContext for systems with limited | Jørgen Lind | 2010-11-24 | 3 | -19/+64 | |
* | | | Lighthouse: move the currentContext functionality to QPlatformGLContext | Jørgen Lind | 2010-11-22 | 3 | -7/+47 | |
* | | | No more windowsurface for QGLWidget in Lighthouse | Jørgen Lind | 2010-11-22 | 1 | -0/+1 | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouse | Gunnar Sletta | 2010-11-19 | 1 | -0/+9 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add workaround_brokenFBOReadback=true for mali | Gunnar Sletta | 2010-11-19 | 1 | -0/+9 | |
* | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | |