summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglframebufferobject.cpp
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-281-1/+1
* | Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
* | Merge commit 'qt/master'Jason Barron2009-08-181-4/+2
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-2/+2
| * | Removed unused member variable from QGLFramebufferObjectPrivate.Kim Motoyoshi Kalland2009-08-171-2/+0
* | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-1/+4
|\ \ \ | |/ /
| * | Fixed incorrect QGLFramebufferObject documentation.Samuel Rødal2009-07-281-1/+4
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-26/+1
|\ \ \ | |/ /
| * | Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-2/+1
| * | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-24/+0
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-6/+4
|\ \ \ | |/ /
| * | Prevented infinite recursion in GL graphics system.Samuel Rødal2009-06-171-4/+2
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-69/+518
|\ \ \ | |/ /
| * | Make OpenGL/ES 1.1 work again for Qt/EmbeddedRhys Weatherley2009-06-091-0/+2
| * | Fixed bugs in GL2 paint engine when several engines are active.Samuel Rødal2009-05-271-4/+8
| * | A GLint is converted to int for passing to qBound().Martin Smith2009-05-261-1/+1
| * | Fix build failure on MacOS 10.4Tom Cooksey2009-05-261-3/+3
| * | Made PixelBuffer/FramebufferObject report correct DPI based metrics.Samuel Rødal2009-05-251-7/+8
| * | Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-141-3/+7
| * | Reverted use of GL 2 engine as default on desktop.Samuel Rødal2009-05-131-1/+2
| * | Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-131-7/+11
| * | Merge branch 'gl2engine-new-shaders' into graphics-masterTom Cooksey2009-05-061-38/+38
| |\ \
| | * | Big GL Extension CleanupTom Cooksey2009-05-061-38/+38
| * | | compile...Gunnar Sletta2009-04-241-2/+1
| |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-graphics-teamGunnar Sletta2009-04-171-15/+13
| |\ \
| | * | Use FBOs as pixmap backend in GL graphics system.Samuel Rødal2009-04-161-9/+7
| | * | Fix off-by-one bugs in the framebuffer blits.Samuel Rødal2009-04-161-6/+6
| * | | Merge branch 'qt/main'Gunnar Sletta2009-04-171-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-071-0/+4
| * | | Fixes: Prevent QGLFramebufferObject from resetting the current context.Samuel Rødal2009-04-011-2/+4
| * | | Fixes: Add blitting and multisample API to QGLFramebufferObject.Samuel Rødal2009-04-011-29/+427
| * | | Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-011-1/+7
| |/ /
| * | Long live Qt!Lars Knoll2009-03-231-0/+749
| /
* | Make Qt exception safer.Robert Griebl2009-06-101-1/+0
|/
* Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-071-0/+4
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+719