summaryrefslogtreecommitdiffstats
path: root/examples/opengl/hellogl_es2
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-317-91/+91
|\
| * Update tech preview license header.Jason McDonald2009-08-317-91/+91
| * Update license headers.Jason McDonald2009-08-117-7/+7
* | Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-261-1/+3
* | Update contact URL in license headers.Jason McDonald2009-08-127-7/+7
* | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-011-0/+3
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-167-14/+14
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-167-14/+14
* | Improvements to shader API in response to API reviewRhys Weatherley2009-06-041-4/+4
* | Merge commit 'qt/master'Samuel Rødal2009-05-131-0/+6
|\ \ | |/
| * Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| * Long live Qt 4.5!Lars Knoll2009-03-2310-0/+1206
* Import shader implementation from before the history cut.Rhys Weatherley2009-04-032-303/+119
* Long live Qt!Lars Knoll2009-03-2310-0/+1206