summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-9/+21
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Enable multisampling on Symbian if hw supports itJani Hautakangas2011-05-111-9/+21
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-112-4/+19
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-4/+19
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-171-13/+20
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Check if OES_texture_npot is present on OpenGL ES 2.Kim Motoyoshi Kalland2011-05-111-13/+20
| | |/ / /
* | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-162-1/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-132-1/+15
| |\ \ \ \
| | * | | | Retain ABI and API compatibility when Qt is built with EGL.Michał Zając2011-05-132-1/+15
| | |/ / /
* | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1382-1411/+1411
|/ / / /
* | | | Symbian build failure for Armv5Sami Merila2011-05-121-2/+2
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-055-6/+55
|\ \ \ | |_|/ |/| |
| * | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-034-3/+46
| * | Only cleanup share widget if it has been created.Armin Berres2011-05-021-3/+9
* | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-021-0/+11
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-021-0/+11
| |\
| | * Fix trailing whitespacesJani Hautakangas2011-05-021-1/+1
| | * Fix for native child widget performance issue.Jani Hautakangas2011-05-021-0/+11
| * | Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-285-55/+35
|\ \
| * \ Merge remote branch 'qt-mainline/master'aavit2011-04-267-37/+33
| |\ \
| * \ \ Merge branch 'master' of scm.dev.troll.no:qt/qt-fire-reviewEskil Abrahamsen Blomfeldt2011-04-235-55/+35
| |\ \ \
| | * | | Added support for six-parameter radial gradients.Samuel Rødal2011-04-135-55/+35
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-32/+16
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-32/+16
| |\ \ \
| | * | | Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
| | * | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-291-2/+25
| | |\ \ \
* | | | | | Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-142-5/+2
* | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-1419-263/+479
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-stagingaavit2011-04-121-1/+9
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update XCreateWindow in qgl_X11egl.cppJuanZhao2011-04-121-1/+9
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-13/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-13/+0
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-053-3/+72
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-295-23/+51
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
| * | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-054-12/+4
| * | | | | | Made extension resolving work with Core profile.Samuel Rødal2011-04-054-50/+100
| * | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-035-5/+74
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-315-5/+74
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-312-2/+2
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.Samuel Rødal2011-03-292-2/+2
| | | | | |/ / | | | | |/| |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-283-3/+72
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Native image handle provider support in QGLPixmapDataLaszlo Agocs2011-03-243-3/+72
| * | | | | QGLContext on EGL gets an additional QEglProperties static field applied to e...Michael Dominic K2011-04-013-1/+12
| * | | | | opengl2: Make maximum cached glyph size configurableSami Kyöstilä2011-03-311-1/+6
| * | | | | Fixed bad merges in GL windowsurface and get rid of redundant variable.Samuel Rødal2011-03-291-2/+9
| * | | | | Added WindowSurfaceFeature enum to QWindowSurface.Samuel Rødal2011-03-292-9/+8
| * | | | | Added preserved contents property to QWindowSurface.Samuel Rødal2011-03-292-26/+18
| |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-285-2/+40
| |\ \ \ \