summaryrefslogtreecommitdiffstats
path: root/examples/opengl
Commit message (Expand)AuthorAgeFilesLines
* Made hellogl example compile when GL_MULTISAMPLE is not defined.Samuel Rødal2009-09-211-1/+5
* Fixed a warning.Trond Kjernaasen2009-09-211-1/+1
* Make OpenGL overpainting example compile under OpenGL/ES 1.1Rhys Weatherley2009-09-212-5/+12
* remove display lists and qt3d-ize overpainting/hellogl exampleSarah Smith2009-09-218-231/+549
* Don't have to glEnable(GL_TEXTURE_2D) when using shaders.Rhys Weatherley2009-09-141-4/+0
* Port the textures example to OpenGL/ES 2.0Rhys Weatherley2009-09-113-35/+91
* Updated the pbuffers2 example to make it work with the GL2 engine.Kim Motoyoshi Kalland2009-09-091-0/+2
* Update license headers again.Jason McDonald2009-09-0959-236/+236
* Port examples/opengl/textures to OpenGL/ES 1.1Rhys Weatherley2009-09-084-38/+51
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3159-767/+767
|\
| * Update tech preview license header.Jason McDonald2009-08-3159-767/+767
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-115-19/+19
| * Update license headers.Jason McDonald2009-08-1159-59/+59
* | Ensured that the framebufferobject example has a stencil buffer.Samuel Rødal2009-08-281-0/+1
* | Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.Trond Kjernåsen2009-08-262-28/+28
* | Made the opengl/overpainting example work with the GL 2 engine.Trond Kjernåsen2009-08-261-0/+5
* | Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-261-1/+3
* | Fix double to float truncation warning.Alessandro Portale2009-08-241-1/+1
* | Fix double to float truncation warning.Alessandro Portale2009-08-211-1/+1
* | renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-2111-11/+11
* | 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