Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 8 | -21/+411 |
|\ | |||||
| * | Temporary hack so QtOpenGL compiles for Lighthouse | Paul Olav Tvete | 2010-07-14 | 2 | -2/+4 |
| * | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 10 | -37/+117 |
| |\ | |||||
| * | | Fix deletion of QPlatformGLContext | Jørgen Lind | 2010-07-08 | 1 | -1/+1 |
| * | | Make tempcontext use new lighthouse api | Jørgen Lind | 2010-07-08 | 1 | -3/+5 |
| * | | Never compile lighthouse with EGL support | Jørgen Lind | 2010-07-07 | 1 | -2/+0 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-06-24 | 1 | -1/+0 |
| |\ \ | |||||
| * | | | Adding -qpa configure switch | Jørgen Lind | 2010-06-24 | 1 | -2/+2 |
| * | | | Renamed files from *_lite* to *_qpa* | Jørgen Lind | 2010-06-24 | 2 | -1/+1 |
| * | | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 5 | -15/+15 |
| * | | | Disable the all native child widgets on lighthouse | Jørgen Lind | 2010-06-23 | 1 | -1/+1 |
| * | | | Remove dead code (QPlatformGLWidgetSurface). | Bjørn Erik Nilsen | 2010-06-23 | 1 | -9/+0 |
| * | | | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 23 | -280/+651 |
| |\ \ \ | |||||
| * | | | | Added QPlatformGLContext to QPlatformWindow | Jørgen Lind | 2010-06-11 | 4 | -162/+18 |
| * | | | | gl on openkode. QGLWidget only works for toplevel widgets | Jørgen Lind | 2010-06-01 | 2 | -111/+3 |
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-05-10 | 18 | -225/+358 |
| |\ \ \ \ | |||||
| * | | | | | ifdef fix for egl on ws_lite | tsenyk | 2010-05-05 | 4 | -6/+112 |
| * | | | | | Use QGLPixmapData for testlite when in OpenGL mode | Tom Cooksey | 2010-04-30 | 1 | -1/+1 |
| * | | | | | Export QGLWindowSurface so it can be used by Lighthouse plugins | Tom Cooksey | 2010-04-30 | 1 | -1/+1 |
| * | | | | | Add QPlatformGLWidgetSurface::filterEvent | Tom Cooksey | 2010-04-29 | 2 | -0/+15 |
| * | | | | | Add QPlatformGLWidgetSurface to GL integrtation | Tom Cooksey | 2010-04-29 | 4 | -28/+58 |
| * | | | | | Update QGLWindowSurface to reflect geometry -> size name change | Tom Cooksey | 2010-04-23 | 2 | -11/+33 |
| * | | | | | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 23 | -143/+381 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make a top-level QGLWidget work once, 50% of the time | Tom Cooksey | 2010-04-08 | 2 | -4/+14 |
| * | | | | | | Rename qglplatformintegration_lite.h & add QGLWidget surface | Tom Cooksey | 2010-04-08 | 4 | -3/+22 |
| * | | | | | | Fixup QPlatformGLContext | Tom Cooksey | 2010-04-08 | 2 | -3/+16 |
| * | | | | | | Introduce QPlatformGLContext to enable QtOpenGL in Lighthouse | Tom Cooksey | 2010-04-06 | 5 | -32/+136 |
| * | | | | | | Stub out QtOpenGL on Lighthouse & get it compiling | Tom Cooksey | 2010-03-31 | 5 | -1/+329 |
| * | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-18 | 17 | -74/+243 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 19 | -627/+334 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 38 | -625/+5264 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 26 | -828/+1003 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2010-01-14 | 69 | -1989/+2608 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | compile with Q_WS_LITE | Harald Fernengel | 2009-12-04 | 1 | -1/+1 |
| * | | | | | | | | | | | make sure that x11 is disabled when building embedded_lite | Harald Fernengel | 2009-12-04 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2010-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Compile with qmlscene. | Bjørn Erik Nilsen | 2010-07-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-07-15 | 10 | -38/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix text drawing into alpha pixmap with opengl engine | Eskil Abrahamsen Blomfeldt | 2010-07-07 | 2 | -6/+0 |
| * | | | | | | | | | | | Got rid of unused variable compiler warning. | Samuel Rødal | 2010-07-01 | 1 | -1/+1 |
| * | | | | | | | | | | | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2 | Michael Dominic K | 2010-07-01 | 4 | -2/+41 |
| * | | | | | | | | | | | Check for EGLSurface leak only when paint device is a QGLWidget. | Michael Dominic K | 2010-07-01 | 1 | -9/+12 |
| * | | | | | | | | | | | Export various symbols needed to make a custom GL graphicssystem. | Michael Dominic K | 2010-06-30 | 3 | -2/+4 |
| * | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Gunnar Sletta | 2010-06-30 | 8 | -8/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-28 | 6 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-27 | 6 | -6/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | EGL plane levels are the same as all other GL backends. | Trond Kjernåsen | 2010-06-25 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Need to access extensionFuncs in subclasses too. | Michael Dominic K | 2010-06-25 | 2 | -1/+8 |
| | | | * | | | | | | | | | | | Export QGLWindowSurface too. | Michael Dominic K | 2010-06-25 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Export the QGLPixmapData so that we can override it in a custom graphics system. | Michael Dominic K | 2010-06-25 | 1 | -1/+1 |