summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-022-2/+20
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-11-297-27/+74
| |\ \
| * | | print out which GLSL shader that failed compilation for better debuggingGunnar Sletta2010-11-281-2/+19
| * | | --warnGunnar Sletta2010-11-241-0/+1
* | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-298-32/+74
|\ \ \ \ | | |/ / | |/| |
| * | | Added mipmap property to QGLFramebufferObjectFormat.Kim Motoyoshi Kalland2010-11-263-7/+49
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-254-20/+25
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix a build break when namespace is definedMiikka Heikkinen2010-11-221-17/+17
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-191-17/+17
| | |\
| | | * Fix for QtOpenGL RVCT4 compilation errorJani Hautakangas2010-11-181-17/+17
| | * | Fix possible corrupted text when gl glyph cache becomes fullEskil Abrahamsen Blomfeldt2010-11-193-3/+27
| | * | Fixed crash when destroying QGLWidgetThorbjørn Lindeijer2010-11-171-1/+2
| | * | Prevent crash in GL 2 engine when stroking null rectangle.Samuel Rødal2010-11-171-0/+3
| | * | Fix possible missing glyphs in text when using GL engineEskil Abrahamsen Blomfeldt2010-11-163-2/+24
| | |/
| * | 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
* | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-266-36/+89
* | | Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-263-12/+22
* | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-243-19/+64
* | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-223-7/+47
* | | No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-221-0/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouseGunnar Sletta2010-11-191-0/+9
|\ \ \ | |/ / |/| |
| * | Add workaround_brokenFBOReadback=true for maliGunnar Sletta2010-11-191-0/+9
* | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |