summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261-1/+1
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
| |\
| | * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | | Remove Lighthouse specific code in QGLWidget constructorJørgen Lind2011-01-041-34/+0
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-0/+1
|\ \ | |/
| * Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-161-0/+1
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-081-0/+4
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-0/+4
| |\ \ | | |/
| | * Fix warning about address of a function being constant.Thiago Macieira2010-11-261-0/+4
* | | Optimize behavior of QGLTextureCacheHarald Fernengel2010-12-071-12/+0
|/ /
* | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-261-10/+14
* | Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-261-12/+0
* | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-241-9/+49
* | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-221-0/+24
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-1/+17
|\ \ | |/
| * Prevented race condition on texture destruction.Samuel Rødal2010-11-081-0/+11
| * Prevented threading related crash in OpenGL module.Samuel Rødal2010-10-291-1/+6
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-1/+7
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+1
| |\ \ | | |/
| | * Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-221-1/+1
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-0/+6
| |\ \ | | |/
| | * Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-201-0/+6
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-3/+0
|\ \ \ | |/ /
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-3/+0
| |\ \ | | |/
| | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-121-3/+0
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-0/+3
|\ \ \ | |/ /
| * | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-7/+29
| |\ \ | | |/
| | * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-271-7/+26
| | * Don't pretend to support single buffered EGL surfaces.Trond Kjernåsen2010-09-241-0/+3
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-26/+7
| |\ \ | | |/
| | * Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-231-26/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-3/+2
|\ \ \ | |/ /
| * | Fixes makeCurrent() failed messages on several systems.Trond Kjernåsen2010-09-161-3/+2
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-11/+91
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-5/+4
| |\ \ | | |/
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-0/+2
| | |\
| | | * Recognize GL_ARB_shader_objects as indicating shadersRhys Weatherley2010-08-271-0/+2
| | * | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| * | | Doc update regarding threaded painting with QPainter in the QGL module.Trond Kjernåsen2010-09-091-9/+83
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-311-6/+10
| |\ \ \
| | * | | Doc update: Mention the Qt::AA_X11InitThreads application attribute.Trond Kjernåsen2010-08-301-6/+10
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-0/+3
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-0/+3
| | |\ \ | | | |/
| | | * Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-161-2/+10
| | | * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-0/+3
* | | | Compile fixPaul Olav Tvete2010-09-031-0/+3
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-7/+58
|\ \ \ \ | |/ / /
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-08-251-12/+78
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-12/+78
| | |\ \ \ | | | |/ /
| | | * | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5