summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-24/+4
|\
| * Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-091-24/+4
| * Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
* | Adding debug output for not supported gl featuresIan2011-06-201-0/+33
* | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-061-17/+17
|\ \
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* | | Fall back to using paths for large fonts in drawStaticText()Eskil Abrahamsen Blomfeldt2011-05-181-11/+22
|/ /
* | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-031-2/+29
* | Added support for six-parameter radial gradients.Samuel Rødal2011-04-131-1/+7
* | Made extension resolving work with Core profile.Samuel Rødal2011-04-051-18/+25
* | opengl2: Make maximum cached glyph size configurableSami Kyöstilä2011-03-311-1/+6
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-281-2/+7
|\ \
| * | Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-231-2/+7
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-4/+0
|\ \ \ | |/ / |/| / | |/
| * Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-221-4/+0
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-4/+24
|\ \ | |/
| * Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-151-4/+24
* | Fix static text item positioning GL2 paint engineJiang Jiang2011-03-111-2/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-4/+7
|\ \ | |/
| * Fixed missing text when using static text items in GL 2 engine.Samuel Rødal2011-02-021-5/+8
* | 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-261-9/+13
| |\ \
| * | | 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-171-1/+1
|\ \ \ | |/ /
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | | 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-5/+47
|\ \ \ | |/ / |/| / | |/
| * Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-131-5/+47
* | Fixed stroke / fill inconsistencies in GL 2 paint engine.Samuel Rødal2010-12-141-40/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-5/+19
|\ \ | |/
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-0/+5
|\ \ | |/
| * Fix possible corrupted text when gl glyph cache becomes fullEskil Abrahamsen Blomfeldt2010-11-191-2/+7
| * 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-161-0/+2
* | Fix compilation after merge.Olivier Goffart2010-11-121-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-12/+12
|\ \ | |/
| * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-12/+12
* | Merge branch 'lancelot'aavit2010-11-021-1/+2
|\ \
| * | Fixes unstability caused by a dangling pointer in GL text renderingTrond Kjernåsen2010-10-271-1/+2
* | | 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-021-0/+26
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-5/+5
|\ \ \ | |/ / |/| / | |/
| * Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-211-1/+1
| * Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-201-4/+4