| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | 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 |
|
|
| * | | | | | Make getters for staticContentsSupport and partialUpdateSupport virtual | Armin Berres | 2011-03-16 | 2 | -3/+13 |
|
|
* | | | | | | Remove DefaultSharedContext from Lighthouse API. | Samuel Rødal | 2011-04-13 | 2 | -18/+0 |
|
|
* | | | | | | Fix QPA prerendered fonts in combination with GL paint engine. | con | 2011-04-05 | 1 | -4/+9 |
|
|
* | | | | | | Compile fixes for GL ES and Mac | con | 2011-04-05 | 2 | -13/+21 |
|
|
* | | | | | | Lighthouse: fixup from cherry-pick | Jørgen Lind | 2011-03-21 | 1 | -1/+0 |
|
|
* | | | | | | Compile fix for QPA | Paul Olav Tvete | 2011-03-21 | 1 | -1/+2 |
|
|
* | | | | | | Fixed compilation of QtOpenGL with Q_WS_QPA. | Samuel Rødal | 2011-03-17 | 1 | -0/+4 |
| |/ / / /
|/| | | | |
|
* | | | | | 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 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 |
|
|
* | | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-03 | 2 | -5/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | 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 |
|
|
* | | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-01 | 14 | -84/+301 |
|\ \ \ \
| |/ / / |
|
| * | | | 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 |
|
|
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-02-10 | 4 | -65/+259 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Fix for loading QPixmaps from file in GL graphics system | Jani Hautakangas | 2011-02-09 | 1 | -22/+22 |
|
|
| | * | | | Fix code style in qgl_symbian.cpp | Jani Hautakangas | 2011-02-09 | 1 | -4/+4 |
|
|
| | * | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. | Jani Hautakangas | 2011-02-09 | 2 | -0/+119 |
|
|
| | * | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load. | Jani Hautakangas | 2011-02-08 | 2 | -34/+83 |
|
|
| | * | | | Recreate GL surface when native window is resized on Symbian | Jani Hautakangas | 2011-02-08 | 1 | -9/+35 |
|
|
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-04 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * | | | | Fix warning about deprecated conversions of string literals to char * | hjk | 2011-02-04 | 1 | -2/+2 |
|
|
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-03 | 3 | -4/+14 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | / /
| | | |/ /
| | |/| | |
|
| | * | | | Fixed missing text when using static text items in GL 2 engine. | Samuel Rødal | 2011-02-02 | 3 | -5/+14 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'integration' | Yoann Lopes | 2011-02-02 | 1 | -0/+7 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Fixes compilation when using FreeType on Symbian. | Yoann Lopes | 2011-01-31 | 1 | -0/+7 |
|
|
| * | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2011-01-27 | 8 | -69/+124 |
| |\ \ \ |
|
| * \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 6 | -12/+12 |
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/| |
|
| | * | | Fix static build on Windows with MinGW. | Mark Brand | 2011-01-17 | 6 | -12/+12 |
|
|