| Commit message (Expand) | Author | Age | Files | Lines |
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 63 | -63/+63 |
|
|
* | Make pbuffers example compile under OpenGL/ES 1.1 | Rhys Weatherley | 2009-11-15 | 1 | -0/+8 |
|
|
* | Modify QGLShader and QGLShaderProgram in response to API review | Rhys Weatherley | 2009-11-05 | 2 | -17/+25 |
|
|
* | Fixed hardcoded GL library names on WinCE. | Trond Kjernåsen | 2009-11-04 | 2 | -15/+0 |
|
|
* | compile fix with namepaces | hjk | 2009-10-15 | 2 | -0/+4 |
|
|
* | hellogl now runs on QT_OPENGL_ES_1 (ie N95). | Sarah Smith | 2009-10-09 | 7 | -6/+38 |
|
|
* | Fix compilation on Solaris. | Thiago Macieira | 2009-10-05 | 1 | -3/+3 |
|
|
* | Compile fix for pbuffers under Linux | Rhys Weatherley | 2009-10-01 | 2 | -1/+2 |
|
|
* | Remove display lists and refactor ready for ES/ES2 port | Sarah Smith | 2009-10-01 | 6 | -168/+649 |
|
|
* | Made hellogl example compile when GL_MULTISAMPLE is not defined. | Samuel Rødal | 2009-09-21 | 1 | -1/+5 |
|
|
* | Fixed a warning. | Trond Kjernaasen | 2009-09-21 | 1 | -1/+1 |
|
|
* | Make OpenGL overpainting example compile under OpenGL/ES 1.1 | Rhys Weatherley | 2009-09-21 | 2 | -5/+12 |
|
|
* | remove display lists and qt3d-ize overpainting/hellogl example | Sarah Smith | 2009-09-21 | 8 | -231/+549 |
|
|
* | Don't have to glEnable(GL_TEXTURE_2D) when using shaders. | Rhys Weatherley | 2009-09-14 | 1 | -4/+0 |
|
|
* | Port the textures example to OpenGL/ES 2.0 | Rhys Weatherley | 2009-09-11 | 3 | -35/+91 |
|
|
* | Updated the pbuffers2 example to make it work with the GL2 engine. | Kim Motoyoshi Kalland | 2009-09-09 | 1 | -0/+2 |
|
|
* | Update license headers again. | Jason McDonald | 2009-09-09 | 59 | -236/+236 |
|
|
* | Port examples/opengl/textures to OpenGL/ES 1.1 | Rhys Weatherley | 2009-09-08 | 4 | -38/+51 |
|
|
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 59 | -767/+767 |
|\ |
|
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 59 | -767/+767 |
|
|
| * | Eliminate some mentions of Trolltech. | Jason McDonald | 2009-08-11 | 5 | -19/+19 |
|
|
| * | Update license headers. | Jason McDonald | 2009-08-11 | 59 | -59/+59 |
|
|
* | | Ensured that the framebufferobject example has a stencil buffer. | Samuel Rødal | 2009-08-28 | 1 | -0/+1 |
|
|
* | | Fixed the bubbles.svg file after fixing some bugs in the SVG renderer. | Trond Kjernåsen | 2009-08-26 | 2 | -28/+28 |
|
|
* | | Made the opengl/overpainting example work with the GL 2 engine. | Trond Kjernåsen | 2009-08-26 | 1 | -0/+5 |
|
|
* | | Improved QPainter API for allowing native painting in GL / VG. | Samuel Rødal | 2009-08-26 | 1 | -1/+3 |
|
|
* | | Fix double to float truncation warning. | Alessandro Portale | 2009-08-24 | 1 | -1/+1 |
|
|
* | | Fix double to float truncation warning. | Alessandro Portale | 2009-08-21 | 1 | -1/+1 |
|
|
* | | renamed examplebase.pri to symbianpkgrules.pri | Espen Riskedal | 2009-08-21 | 11 | -11/+11 |
|
|
* | | Fix opengl examples after bad merge. | Jason Barron | 2009-08-20 | 4 | -28/+79 |
|
|
* | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 59 | -77/+84 |
|\ \ |
|
| * | | Replace some mentions of Trolltech with more appropriate terms. | Jason McDonald | 2009-08-12 | 5 | -19/+19 |
|
|
| * | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 59 | -59/+59 |
|
|
* | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-07-27 | 1 | -0/+3 |
|\ \ \
| |/ / |
|
| * | | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again. | Samuel Rødal | 2009-07-01 | 1 | -0/+3 |
|
|
* | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 59 | -118/+118 |
|\ \ \
| |/ / |
|
| * | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 59 | -118/+118 |
| |\ \
| | |/ |
|
| | * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 59 | -118/+118 |
|
|
* | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 5 | -309/+146 |
|\ \ \
| |/ / |
|
| * | | Improvements to shader API in response to API review | Rhys Weatherley | 2009-06-04 | 1 | -4/+4 |
|
|
| * | | Merge commit 'qt/master' | Samuel Rødal | 2009-05-13 | 3 | -6/+14 |
| |\ \ |
|
| | * | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 1 | -1/+1 |
| | |/ |
|
| * | | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-04-03 | 2 | -303/+119 |
|
|
| * | | Fixes: Use the blit/multisample FBO API in the framebuffer object example. | Samuel Rødal | 2009-04-01 | 2 | -5/+26 |
|
|
| * | | Long live Qt! | Lars Knoll | 2009-03-23 | 94 | -0/+8175 |
| / |
|
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-05-18 | 1 | -5/+7 |
|\ \
| |/ |
|
| * | Only link against opengles .LIB files if on WinCE | Tom Cooksey | 2009-05-11 | 1 | -5/+7 |
|
|
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-05-11 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Fixing hellogl_es2 for Windows CE | Thomas Hartmann | 2009-05-08 | 1 | -0/+6 |
|
|
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 94 | -0/+8175 |
|
|