summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-141-2/+2
|\
| * Fix static text item positioning GL2 paint engineJiang Jiang2011-03-111-2/+2
* | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
|/
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-033-4/+14
|\
| * Fixed missing text when using static text items in GL 2 engine.Samuel Rødal2011-02-023-5/+14
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-271-3/+18
|\ \
| * \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2617-29/+29
| |\ \
| * | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-261-3/+18
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-2/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix static build on Windows with MinGW.Mark Brand2011-01-171-2/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1717-21/+17
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1017-17/+17
| |\ \
| | * | Update copyright year to 2011.Jason McDonald2011-01-1017-17/+17
| * | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-101-4/+0
| |\ \ \ | | |/ / | |/| |
| | * | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
* | | | Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-101-8/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-211-8/+12
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-213-136/+713
|\ \ \ \
| * | | | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-213-136/+713
| |/ / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-203-5/+52
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-161-1/+4
| |/
| * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| * Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-132-5/+49
* | Fixed stroke / fill inconsistencies in GL 2 paint engine.Samuel Rødal2010-12-142-42/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-13/+30
|\ \ | |/
| * Missing glyphs in GL when scaling QStaticText and QML text itemsEskil Abrahamsen Blomfeldt2010-12-101-5/+13
| * Try using pure scissor clip in GL 2 engine for rotations.Samuel Rødal2010-12-091-1/+5
| * Fixed missing text in GL 2 engine after recreating a context.Samuel Rødal2010-12-091-1/+3
| * Fix text disappearing on GL when RGB-path is taken (no transformation)Eskil Abrahamsen Blomfeldt2010-12-071-8/+11
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-253-19/+23
|\ \ | |/
| * 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
| * | 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
* | Fix compilation after merge.Olivier Goffart2010-11-121-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-14/+14
|\ \ | |/
| * 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-091-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-051-12/+12
| |\ \ | | |/ | |/|
| | * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-12/+12
* | | 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
* | | Fixed index type after reapplying commit 89cbb165.Kim Motoyoshi Kalland2010-11-021-1/+4