Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 1 | -2/+4 |
|\ | |||||
| * | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Added support for blitting to native child widgets in GL window surface. | Samuel Rødal | 2010-10-22 | 1 | -1/+1 |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection. | Jani Hautakangas | 2010-10-20 | 1 | -1/+3 |
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-12 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | Revert "Don't define highp/mediump/lowp if desktop GL has them" | Trond Kjernåsen | 2010-10-12 | 1 | -2/+1 |
| * | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Don't disable texture_from_pixmap on GLX/X11 by default. | Trond Kjernåsen | 2010-09-27 | 1 | -0/+3 |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 1 | -3/+0 |
| |\ \ | | |/ | |||||
| | * | Don't try to use the texture_from_pixmap extension in GL on desktop/X11. | Trond Kjernåsen | 2010-09-23 | 1 | -3/+0 |
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-08-26 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Don't define highp/mediump/lowp if desktop GL has them | Rhys Weatherley | 2010-08-13 | 1 | -1/+2 |
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-26 | 1 | -1/+8 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
* | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -1/+8 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -1/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Introduce QtOpenGL module for Symbian. | Jani Hautakangas | 2010-08-20 | 1 | -1/+8 |
* | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -0/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 1 | -0/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Prevented Xorg crash in qtdemo when running corkboards example. | Samuel Rødal | 2010-08-17 | 1 | -0/+3 |
* | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 1 | -3/+14 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 1 | -2/+3 |
| |\ \ \ | | |/ / | |||||
| * | | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 1 | -3/+3 |
| * | | | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 1 | -16/+38 |
| |\ \ \ | |||||
| * | | | | Added QPlatformGLContext to QPlatformWindow | Jørgen Lind | 2010-06-11 | 1 | -4/+2 |
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-05-10 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | ifdef fix for egl on ws_lite | tsenyk | 2010-05-05 | 1 | -3/+6 |
| * | | | | | Add QPlatformGLWidgetSurface to GL integrtation | Tom Cooksey | 2010-04-29 | 1 | -1/+3 |
| * | | | | | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 1 | -7/+7 |
| |\ \ \ \ \ | |||||
| * | | | | | | Rename qglplatformintegration_lite.h & add QGLWidget surface | Tom Cooksey | 2010-04-08 | 1 | -1/+1 |
| * | | | | | | Introduce QPlatformGLContext to enable QtOpenGL in Lighthouse | Tom Cooksey | 2010-04-06 | 1 | -1/+7 |
| * | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-18 | 1 | -3/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 1 | -8/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 1 | -27/+57 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 1 | -42/+62 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2010-01-14 | 1 | -22/+82 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | compile with Q_WS_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 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2 | Michael Dominic K | 2010-07-01 | 1 | -0/+1 |
| * | | | | | | | | | | | Export various symbols needed to make a custom GL graphicssystem. | Michael Dominic K | 2010-06-30 | 1 | -1/+1 |
| * | | | | | | | | | | | 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 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Need to access extensionFuncs in subclasses too. | Michael Dominic K | 2010-06-25 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Track the GL DCs we use across different threads under Windows. | Trond Kjernåsen | 2010-07-08 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-07-06 | 1 | -18/+143 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | |