Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc: Clarified and tidied up OpenGL overlay color documentation. | David Boddie | 2011-04-15 | 1 | -9/+4 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-03-25 | 25 | -166/+1689 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-24 | 5 | -21/+44 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-22 | 5 | -23/+51 |
| | |\ | |||||
| | | * | Change Symbian to use destroyed swap behaviour in GL | Jani Hautakangas | 2011-03-22 | 5 | -23/+51 |
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-23 | 3 | -141/+126 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 3 | -141/+126 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-21 | 3 | -141/+126 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Change the pooled QGLPixmapData to be backed by QVolatileImage. | Laszlo Agocs | 2011-03-21 | 3 | -141/+126 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-03-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Handle removal of setter for partialUpdateSupport | Eckhart Koppen | 2011-03-22 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-03-21 | 3 | -2/+19 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Optimized glyph uploads in GL texture cache. | Samuel Rødal | 2011-03-21 | 3 | -2/+19 |
| * | | | | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 16 | -38/+1514 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-19 | 1 | -2/+25 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-18 | 1 | -2/+25 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-17 | 1 | -2/+25 |
| | | | |\ \ | | | | | |/ | | | | |/| | |||||
| | | | | * | Changes to driver workarounds. | Robin Burchell | 2011-03-17 | 1 | -2/+25 |
| | * | | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-17 | 19 | -26/+1489 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 12 | -17/+1468 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Hot fix for compilation without QGL_USE_TEXTURE_POOL | Jani Hautakangas | 2011-03-15 | 1 | -0/+2 |
| | | | * | | Initial implementation of GLES2.0 resource pooling | Jani Hautakangas | 2011-03-15 | 12 | -17/+1467 |
| | * | | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-03 | 2 | -5/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-01 | 14 | -84/+301 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Remove warning msg in Lighthouse QGLWidget code | Jørgen Lind | 2011-02-09 | 1 | -1/+0 |
| | * | | | | | | Export QGLEngineSharedShaders | Jørgen Lind | 2011-02-09 | 1 | -1/+1 |
| | * | | | | | | Dont include EGL header when compiling with QT_NO_EGL | Jørgen Lind | 2011-02-09 | 1 | -1/+1 |
| | * | | | | | | Lighthouse: QGLWidgetPropogate the resizeEvent down to the Widget | Jørgen Lind | 2011-02-07 | 1 | -1/+2 |
| | * | | | | | | Lighthouse: Fix if context isSharing setup for QGLContext | Jørgen Lind | 2011-02-07 | 1 | -0/+2 |
| | * | | | | | | Precision specifiers are not allowed for shader variables | Kristian Høgsberg | 2011-01-27 | 1 | -14/+14 |
| * | | | | | | | Make getters for staticContentsSupport and partialUpdateSupport virtual | Armin Berres | 2011-03-16 | 2 | -3/+13 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix static text item positioning GL2 paint engine | Jiang Jiang | 2011-03-11 | 1 | -2/+2 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 7 | -7/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 7 | -7/+7 |
| | |/ / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -0/+12 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Don't use EGL surfaces for translucency with 32MB GPU chip. | Jani Hautakangas | 2011-03-10 | 1 | -0/+12 |
* | | | | | | Doc: Fixed qdoc warnings and made minor improvements. | David Boddie | 2011-03-14 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 2 | -5/+1 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-26 | 4 | -70/+266 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix extern usage in qpixmapdata_gl.cpp | Jani Hautakangas | 2011-02-25 | 1 | -1/+1 |
| | * | | Fix for loading QPixmaps from file in GL graphics system | Jani Hautakangas | 2011-02-25 | 1 | -22/+22 |
| | * | | Fix code style in qgl_symbian.cpp | Jani Hautakangas | 2011-02-25 | 1 | -4/+4 |
| | * | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. | Jani Hautakangas | 2011-02-25 | 2 | -0/+119 |
| | * | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load. | Jani Hautakangas | 2011-02-25 | 2 | -34/+83 |
| | * | | Recreate GL surface when native window is resized on Symbian | Jani Hautakangas | 2011-02-25 | 1 | -13/+41 |
* | | | | OpenGL Framebuffer Format | Gerhard Roethlin | 2011-02-24 | 1 | -1/+1 |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-10 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -0/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem. | Samuel Rødal | 2011-02-09 | 1 | -0/+6 |