summaryrefslogtreecommitdiffstats
path: root/examples/opengl
Commit message (Expand)AuthorAgeFilesLines
* Fix opengl examples after bad merge.Jason Barron2009-08-204-28/+79
* Merge commit 'qt/master'Jason Barron2009-08-1359-77/+84
|\
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-125-19/+19
| * Update contact URL in license headers.Jason McDonald2009-08-1259-59/+59
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-0/+3
|\ \ | |/
| * Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-011-0/+3
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3059-118/+118
|\ \ | |/
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1659-118/+118
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1659-118/+118
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-255-309/+146
|\ \ \ | |/ /
| * | Improvements to shader API in response to API reviewRhys Weatherley2009-06-041-4/+4
| * | Merge commit 'qt/master'Samuel Rødal2009-05-133-6/+14
| |\ \
| | * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| | |/
| * | Import shader implementation from before the history cut.Rhys Weatherley2009-04-032-303/+119
| * | Fixes: Use the blit/multisample FBO API in the framebuffer object example.Samuel Rødal2009-04-012-5/+26
| * | Long live Qt!Lars Knoll2009-03-2394-0/+8175
| /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-5/+7
|\ \ | |/
| * Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-111-0/+6
|\ \ | |/
| * Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| * Long live Qt 4.5!Lars Knoll2009-03-2394-0/+8175
* Long live Qt for S60!axis2009-04-2494-0/+8139