summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-11-291-1/+2
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+2
| |\ \ | | |/
| | * Fixed crash when destroying QGLWidgetThorbjørn Lindeijer2010-11-171-1/+2
* | | --warnGunnar Sletta2010-11-241-0/+1
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-24/+56
|\ \ | |/
| * Prevented race condition on texture destruction.Samuel Rødal2010-11-081-10/+20
| * Prevented threading related crash in OpenGL module.Samuel Rødal2010-10-291-23/+45
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-2/+4
|\ \
| * \ 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-1/+3
| |\ \ | | |/
| | * Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-201-1/+3
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-2/+1
|\ \ \ | |/ /
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-2/+1
| |\ \ | | |/
| | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-121-2/+1
| * | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-0/+3
| |\ \ | | |/
| | * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-271-0/+3
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-3/+0
| |\ \ | | |/
| | * Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-231-3/+0
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-1/+2
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-1/+2
| |\ \ | | |/
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-1/+2
| | |\
| | | * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-1/+2
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-261-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-261-1/+8
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-1/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-1/+8
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-191-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-171-0/+3
* | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-191-3/+14
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-2/+3
| |\ \ \ | | |/ /
| * | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-3/+3
| * | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-16/+38
| |\ \ \
| * | | | Added QPlatformGLContext to QPlatformWindowJørgen Lind2010-06-111-4/+2
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-101-1/+1
| |\ \ \ \
| * | | | | ifdef fix for egl on ws_litetsenyk2010-05-051-3/+6
| * | | | | Add QPlatformGLWidgetSurface to GL integrtationTom Cooksey2010-04-291-1/+3
| * | | | | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-7/+7
| |\ \ \ \ \
| * | | | | | Rename qglplatformintegration_lite.h & add QGLWidget surfaceTom Cooksey2010-04-081-1/+1
| * | | | | | Introduce QPlatformGLContext to enable QtOpenGL in LighthouseTom Cooksey2010-04-061-1/+7
| * | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-181-3/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-111-8/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-27/+57
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-101-42/+62
| |\ \ \ \ \ \ \ \ \