| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | 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/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 |
|
|
* | | | | | 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 branch 'master' into lighthouse-master | Jørgen Lind | 2011-01-26 | 74 | -90/+110 |
| |\ \ \
| | |/ / |
|
| * | | | Make sure we blit the fbo on flush in QGLWindowSurface | Jørgen Lind | 2011-01-26 | 1 | -2/+2 |
|
|
| * | | | Make it possible to vertically mirror gl painting | Jørgen Lind | 2011-01-26 | 3 | -5/+23 |
|
|
| * | | | Make QGLContext::fromPlatformGLContext show correct sharing | Jørgen Lind | 2011-01-25 | 2 | -16/+15 |
|
|
| * | | | Remove Lighthouse specific code from QGLWindowSurface | Jørgen Lind | 2011-01-25 | 1 | -7/+1 |
|
|
| * | | | Remove Lighthouse specific code in QGLWidget constructor | Jørgen Lind | 2011-01-04 | 3 | -39/+83 |
|
|
* | | | | 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 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 72 | -77/+73 |
|\ \ \
| |/ / |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-01-10 | 72 | -73/+73 |
| |\ \ |
|
| | * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 72 | -73/+73 |
|
|
| * | | | Merge branch 'graphics-team-text-4.7' into 4.7 | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 1 | -4/+0 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Fix regression in text rendering in OpenGL2 engine | Eskil Abrahamsen Blomfeldt | 2011-01-05 | 1 | -4/+0 |
|
|
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2011-01-11 | 1 | -8/+12 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 3 | -4/+24 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'qt-graphics-team-text-master' | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 1 | -8/+12 |
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | Optimize texture glyph cache | Eskil Abrahamsen Blomfeldt | 2010-12-21 | 1 | -8/+12 |
|
|
* | | | | | | qt project files: create pkg-config files for mingw | Mark Brand | 2011-01-10 | 1 | -1/+1 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-01-07 | 1 | -3/+4 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|