summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-5/+0
|\
| * Remove driver bug work-around from GL 2 paint engine.Samuel Rødal2010-11-121-5/+0
* | Fix compilation after merge.Olivier Goffart2010-11-121-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1210-47/+96
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-111-1/+1
| |\
| | * Make operator QRectF constHarald Fernengel2010-11-091-1/+1
| * | Doc: Fixing typoSergio Ahumada2010-11-094-5/+5
| * | Prevented race condition on texture destruction.Samuel Rødal2010-11-083-10/+32
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-054-40/+67
| |\ \ | | |/ | |/|
| | * Prevented threading related crash in OpenGL module.Samuel Rødal2010-10-292-24/+51
| | * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-292-16/+16
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-2/+3
|\ \ \ | |/ /
| * | Prevent access to non-existent memory in QGL2PEXVertexArrayTopi Reiniö2010-11-041-2/+3
| |/
* | Merge branch 'lancelot'aavit2010-11-023-8/+11
|\ \
| * | Fixes unstability caused by a dangling pointer in GL text renderingTrond Kjernåsen2010-10-273-8/+11
| * | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
* | | Fixed index type after reapplying commit 89cbb165.Kim Motoyoshi Kalland2010-11-021-1/+4
* | | Reapply "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-11-022-0/+30
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-298-21/+505
|\ \ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2615-113/+142
| |\ \ \
| * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2210-186/+378
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0511-105/+252
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2712-30/+110
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1312-25/+191
| |\ \ \ \ \ \ \
| * | | | | | | | Compile fixPaul Olav Tvete2010-09-031-0/+3
| * | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-261-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-268-24/+467
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-269-27/+474
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-193-6/+41
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-199-12/+65
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Revert "Allow customizing the default fbo from the QPlatformGLContext."Jørgen Lind2010-08-112-7/+0
| | * | | | | | | | | | | Added reduced config to glxconfigJørgen Lind2010-08-061-4/+10
| | * | | | | | | | | | | Add missing null check to lighthouse's QGLTemporaryContext.Christian Kamm2010-08-061-2/+4
| | * | | | | | | | | | | Fixed Lighthouse tempcontext to reset to current contextJørgen Lind2010-08-061-5/+8
| | * | | | | | | | | | | Allow customizing the default fbo from the QPlatformGLContext.Christian Kamm2010-08-062-0/+7
| | * | | | | | | | | | | Make the GLX integration give more correct formatJørgen Lind2010-08-061-1/+2
| * | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1912-11/+6034
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-052-9/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Forgot to makeCurrent before QGLWidget::resizeGL in LighthouseJørgen Lind2010-08-041-0/+1
| | * | | | | | | | | | | | Make QWidget::setPlatformWindowFormat recreate platformWindowJørgen Lind2010-08-041-10/+19
| | * | | | | | | | | | | | QGLWindowSurface does not support partialupdates if not EGL is definedJørgen Lind2010-08-031-0/+2
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-035-14/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make it possible to view what format a QPlatformGlContext hasJørgen Lind2010-08-031-0/+1
| | * | | | | | | | | | | | | Added QGLFormat to QPlatformWindowFormat conversionJørgen Lind2010-07-271-4/+66
| | * | | | | | | | | | | | | fix QGLContext::reset in lighthouseJørgen Lind2010-07-261-2/+4
| | * | | | | | | | | | | | | Make it possible to have shared contexts to LighthouseJørgen Lind2010-07-231-0/+3
| * | | | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-045-14/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Less ugly hack to make QtOpenGL compile on LighthousePaul Olav Tvete2010-07-211-2/+0
| * | | | | | | | | | | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-198-21/+411
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /