summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-198-21/+411
|\
| * Temporary hack so QtOpenGL compiles for LighthousePaul Olav Tvete2010-07-142-2/+4
| * Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1410-37/+117
| |\
| * | Fix deletion of QPlatformGLContextJørgen Lind2010-07-081-1/+1
| * | Make tempcontext use new lighthouse apiJørgen Lind2010-07-081-3/+5
| * | Never compile lighthouse with EGL supportJørgen Lind2010-07-071-2/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-1/+0
| |\ \
| * | | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| * | | Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-242-1/+1
| * | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-245-15/+15
| * | | Disable the all native child widgets on lighthouseJørgen Lind2010-06-231-1/+1
| * | | Remove dead code (QPlatformGLWidgetSurface).Bjørn Erik Nilsen2010-06-231-9/+0
| * | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1823-280/+651
| |\ \ \
| * | | | Added QPlatformGLContext to QPlatformWindowJørgen Lind2010-06-114-162/+18
| * | | | gl on openkode. QGLWidget only works for toplevel widgetsJørgen Lind2010-06-012-111/+3
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-1018-225/+358
| |\ \ \ \
| * | | | | ifdef fix for egl on ws_litetsenyk2010-05-054-6/+112
| * | | | | Use QGLPixmapData for testlite when in OpenGL modeTom Cooksey2010-04-301-1/+1
| * | | | | Export QGLWindowSurface so it can be used by Lighthouse pluginsTom Cooksey2010-04-301-1/+1
| * | | | | Add QPlatformGLWidgetSurface::filterEventTom Cooksey2010-04-292-0/+15
| * | | | | Add QPlatformGLWidgetSurface to GL integrtationTom Cooksey2010-04-294-28/+58
| * | | | | Update QGLWindowSurface to reflect geometry -> size name changeTom Cooksey2010-04-232-11/+33
| * | | | | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2123-143/+381
| |\ \ \ \ \
| * | | | | | Make a top-level QGLWidget work once, 50% of the timeTom Cooksey2010-04-082-4/+14
| * | | | | | Rename qglplatformintegration_lite.h & add QGLWidget surfaceTom Cooksey2010-04-084-3/+22
| * | | | | | Fixup QPlatformGLContextTom Cooksey2010-04-082-3/+16
| * | | | | | Introduce QPlatformGLContext to enable QtOpenGL in LighthouseTom Cooksey2010-04-065-32/+136
| * | | | | | Stub out QtOpenGL on Lighthouse & get it compilingTom Cooksey2010-03-315-1/+329
| * | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1817-74/+243
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-1119-627/+334
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-0138-625/+5264
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-1026-828/+1003
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-1469-1989/+2608
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | compile with Q_WS_LITEHarald Fernengel2009-12-041-1/+1
| * | | | | | | | | | | make sure that x11 is disabled when building embedded_liteHarald Fernengel2009-12-041-1/+1
* | | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Compile with qmlscene.Bjørn Erik Nilsen2010-07-151-1/+1
* | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-1510-38/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Fix text drawing into alpha pixmap with opengl engineEskil Abrahamsen Blomfeldt2010-07-072-6/+0
| * | | | | | | | | | | Got rid of unused variable compiler warning.Samuel Rødal2010-07-011-1/+1
| * | | | | | | | | | | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2Michael Dominic K2010-07-014-2/+41
| * | | | | | | | | | | Check for EGLSurface leak only when paint device is a QGLWidget.Michael Dominic K2010-07-011-9/+12
| * | | | | | | | | | | Export various symbols needed to make a custom GL graphicssystem.Michael Dominic K2010-06-303-2/+4
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-06-308-8/+47
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-286-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-276-6/+13
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | EGL plane levels are the same as all other GL backends.Trond Kjernåsen2010-06-251-1/+1
| | | | * | | | | | | | | | | Need to access extensionFuncs in subclasses too.Michael Dominic K2010-06-252-1/+8
| | | | * | | | | | | | | | | Export QGLWindowSurface too.Michael Dominic K2010-06-251-1/+1
| | | | * | | | | | | | | | | Export the QGLPixmapData so that we can override it in a custom graphics system.Michael Dominic K2010-06-251-1/+1