summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-281-6/+50
|\
| * Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-281-4/+32
| * doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+18
* | Attempting to make EGL compile again and fix some potentialGunnar Sletta2009-08-281-1/+7
|/
* compile on x11Gunnar Sletta2009-08-271-1/+1
* New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-271-58/+224
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-1/+1
|\
| * compile.Harald Fernengel2009-08-211-1/+1
* | Merge commit 'qt/master'Jason Barron2009-08-211-42/+9
|\ \ | |/ |/|
| * Fix QGLWidget::showFullScreen() on X11/EGLTom Cooksey2009-08-211-2/+5
| * Removed PBO texture upload from QGLContextPrivate::bindTexture().Samuel Rødal2009-08-211-40/+4
* | Merge commit 'qt/master'Jason Barron2009-08-181-5/+5
|\ \ | |/
| * Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-5/+5
* | 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-08-061-2/+3
|\ \ | |/
| * fix warnings on mingw (gcc4.4)Thierry Bastian2009-08-041-2/+3
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041-10/+31
|\ \ | |/
| * Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-301-8/+29
| |\
| | * Refactor texture_from_pixmap to not re-create the gl surface each bindTom Cooksey2009-07-291-9/+15
| | * Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-281-5/+20
| * | qdoc fix: stencil buffer is enabled by default, not disabledRhys Weatherley2009-07-301-2/+2
| |/
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-141/+338
|\ \ | |/
| * Fix build on MacTom Cooksey2009-07-221-8/+27
| * Use texture_from_pixmap on X11 & avoid copiesTom Cooksey2009-07-221-138/+158
| * Fixed GL2 engine shader manager to work with more than one context.Kim Motoyoshi Kalland2009-07-211-1/+158
| * Doc: Explicitly declare the module for each namespace to prevent strangeDavid Boddie2009-07-131-0/+1
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+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-86/+440
|\ \ \ | |/ /
| * | Fix build breakage from 1bbe23c5 - endif in the wrong placeRhys Weatherley2009-06-091-1/+1
| * | Make OpenGL/ES 1.1 work again for Qt/EmbeddedRhys Weatherley2009-06-091-0/+15
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't s...David Faure2009-06-041-4/+4
| * | improved string operations all over the placeThierry Bastian2009-05-281-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-6/+42
| |\ \ | | |/
| * | Make QGLWidgets have the same background colour as QWidgetsTom Cooksey2009-05-271-0/+5
| * | Make WA_TranslucentBackground work on QGLWidget for X11Tom Cooksey2009-05-271-1/+1
| * | Avoided expensive image upload for GL pixmap backend for QPixmap::fill.Samuel Rødal2009-05-271-0/+4
| * | Fixed bugs in GL2 paint engine when several engines are active.Samuel Rødal2009-05-271-0/+15
| * | Merge commit 'qt/master'Samuel Rødal2009-05-201-1/+1
| |\ \
| | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
| | |\ \
| * | | | Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-141-13/+52
| * | | | Reverted use of GL 2 engine as default on desktop.Samuel Rødal2009-05-131-2/+2
| * | | | Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-131-12/+21
| * | | | Big GL Extension CleanupTom Cooksey2009-05-061-5/+5
| * | | | Fix OpenGL ES 2.0 breakagesTom Cooksey2009-05-051-0/+2
| * | | | Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-011-55/+120
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+10
| | |\ \ \
| | * \ \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+4
| | |\ \ \ \
generated by cgit v0.12 at 2024-11-13 20:09:02 (GMT)