summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-101-0/+6
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-0/+6
| |\
| | * Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.Samuel Rødal2011-02-091-0/+6
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-104-65/+259
|\ \ \ | |/ / |/| |
| * | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-091-22/+22
| * | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-091-4/+4
| * | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-092-0/+119
| * | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-082-34/+83
| * | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-081-9/+35
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-041-2/+2
|\ \ \
| * | | Fix warning about deprecated conversions of string literals to char *hjk2011-02-041-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 'integration'Yoann Lopes2011-02-021-0/+7
|\ \ \ | |_|/ |/| |
| * | Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-311-0/+7
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-278-69/+124
|\ \ \
| * \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2674-90/+110
| |\ \ \ | | |/ /
| * | | Make sure we blit the fbo on flush in QGLWindowSurfaceJørgen Lind2011-01-261-2/+2
| * | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-263-5/+23
| * | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-252-16/+15
| * | | Remove Lighthouse specific code from QGLWindowSurfaceJørgen Lind2011-01-251-7/+1
| * | | Remove Lighthouse specific code in QGLWidget constructorJørgen Lind2011-01-043-39/+83
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-256-12/+12
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix static build on Windows with MinGW.Mark Brand2011-01-176-12/+12
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1772-77/+73
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1072-73/+73
| |\ \
| | * | Update copyright year to 2011.Jason McDonald2011-01-1072-73/+73
| * | | 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-111-8/+12
|\ \ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-103-4/+24
| |\ \ \ \
| * \ \ \ \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-101-8/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-211-8/+12
* | | | | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-3/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-052-1/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-052-1/+15
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
* | | | | Added warning if <QGLFunctions> is included when GLEW is present.Samuel Rødal2011-01-051-0/+5
|/ / / /
* | | | add missing license headerHarald Fernengel2010-12-221-0/+41
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-216-137/+771
|\ \ \ \
| * | | | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-216-137/+771
| | |/ / | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-207-5/+69
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-4/+7
| |\
| | * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| * | Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| * | Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
| |/
| * Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-132-5/+49
generated by cgit v0.12 at 2024-09-26 22:01:31 (GMT)