Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again. | Samuel Rødal | 2009-07-01 | 1 | -0/+3 |
| | | | | | | | Need to call syncState() to let the paint engine set depth clipping state parameters back to their OpenGL defaults. Reviewed-by: Trond | ||||
* | 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 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Improvements to shader API in response to API review | Rhys Weatherley | 2009-06-04 | 1 | -4/+4 |
| | | | | | | | | | | Task-number: QT-80 Reviewed-by: Ian Walters | ||||
* | | 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 |
| |/ | | | | | | | We introduce this new enum, we should be using it. | ||||
| * | Only link against opengles .LIB files if on WinCE | Tom Cooksey | 2009-05-11 | 1 | -5/+7 |
| | | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek | ||||
| * | Fixing hellogl_es2 for Windows CE | Thomas Hartmann | 2009-05-08 | 1 | -0/+6 |
| | | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice | ||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 94 | -0/+8175 |
| | |||||
* | 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 |
| | | | | RevBy: Trond | ||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 94 | -0/+8175 |