| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-06-08 | 1 | -4/+41 |
|\ |
|
| * | Clipping with rounded rectangles and QVG_SCISSOR_CLIP | Rhys Weatherley | 2010-06-02 | 1 | -4/+41 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-05-17 | 1 | -4/+83 |
|\ \
| |/ |
|
| * | OpenVG blending modes from VG_KHR_advanced_blending extension | Rhys Weatherley | 2010-05-12 | 1 | -4/+83 |
|
|
* | | Apply Rhys's fix to qpaintengine_vg.cpp to make it compile | Thiago Macieira | 2010-04-27 | 2 | -6/+7 |
|
|
* | | Attempt again at fixing the OpenVG paint engine build | Thiago Macieira | 2010-04-26 | 2 | -8/+11 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-22 | 1 | -32/+22 |
|\ \
| |/ |
|
| * | correctly position glyphs for complex languages | Lars Knoll | 2010-04-21 | 1 | -32/+22 |
|
|
* | | Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpainten... | Thiago Macieira | 2010-04-22 | 2 | -4/+4 |
|
|
* | | Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp | Thiago Macieira | 2010-04-22 | 2 | -4/+4 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-21 | 1 | -3/+7 |
|\ \
| |/ |
|
| * | Fix RTL text rendering in the QVGPaintEngine | Alessandro Portale | 2010-04-16 | 1 | -2/+7 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-17 | 1 | -15/+6 |
|\ \ |
|
| * | | Cleanup & remove unused function overloads from QEgl* APIs | Tom Cooksey | 2010-04-16 | 1 | -15/+6 |
|
|
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-04-16 | 6 | -8/+42 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Symbol visibility fixes for RVCT4 on Symbian | Iain | 2010-04-15 | 2 | -6/+6 |
|
|
| * | Implement OpenVG buffer scrolling and enable it on Symbian. | Jason Barron | 2010-04-14 | 4 | -2/+36 |
|
|
* | | Wrap EGL image function pointers and move into QEgl namespace | Tom Cooksey | 2010-04-15 | 1 | -6/+6 |
|
|
* | | Fix compilation of ShivaVG, which does not have EGL. | Rhys Weatherley | 2010-04-15 | 1 | -0/+2 |
|
|
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-12 | 1 | -11/+13 |
|\ \
| |/ |
|
| * | Enable preserved swap behavior when surface is created due to resize. | Jason Barron | 2010-04-09 | 1 | -11/+13 |
|
|
* | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7 | Olivier Goffart | 2010-03-31 | 1 | -19/+22 |
|\ \ |
|
| * \ | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-31 | 1 | -19/+22 |
| |\ \
| | |/ |
|
| | * | Another "off by 1" problem in OpenVG - in paths this time. | Rhys Weatherley | 2010-03-30 | 1 | -19/+22 |
|
|
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-29 | 2 | -10/+7 |
| |\ \
| | |/ |
|
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 7 | -90/+101 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 1 | -8/+3 |
| |\ \ |
|
| | * | | Don't detect EGLImage presence by testing function pointers | Tom Cooksey | 2010-03-29 | 1 | -2/+2 |
|
|
| | * | | Remove EGLImage create/destroy resolving from VG pixmap data | Tom Cooksey | 2010-03-26 | 1 | -6/+1 |
| | |/ |
|
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 1 | -9/+4 |
| |\ \
| | |/
| |/| |
|
| * | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 2 | -34/+33 |
| |\ \ |
|
| * | | | Fix compilation of OpenVG. | Jason Barron | 2010-03-18 | 2 | -17/+17 |
|
|
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 2 | -21/+17 |
| |\ \ \ |
|
| * \ \ \ | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 1 | -1/+2 |
| |\ \ \ \ |
|
| * | | | | | Fix compilation of OpenVG paint engine with OpenVG 1.0 | Rhys Weatherley | 2010-03-14 | 1 | -0/+9 |
|
|
| * | | | | | Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/Hint | Trond Kjernåsen | 2010-03-09 | 2 | -3/+4 |
|
|
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 1 | -76/+72 |
| |\ \ \ \ \ |
|
| * | | | | | | Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h | Tom Cooksey | 2010-03-02 | 4 | -4/+4 |
|
|
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 1 | -59/+69 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Fix compilation error in openVG | Olivier Goffart | 2010-02-23 | 1 | -1/+1 |
|
|
| * | | | | | | | Made the qDrawPixmaps() API public (with modifications). | Trond Kjernåsen | 2010-02-23 | 2 | -13/+13 |
|
|
| * | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 2 | -30/+47 |
| |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 2 | -22/+11 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -1/+1 |
|
|
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat... | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 2 | -13/+157 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Make QStaticText private API | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -1/+1 |
|
|
| | * | | | | | | | | | Compile for S60 | Eskil Abrahamsen Blomfeldt | 2010-01-26 | 2 | -14/+19 |
|
|
| | * | | | | | | | | | Attempt at making OpenVG work with QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-26 | 2 | -25/+37 |
|
|
| * | | | | | | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 1 | -11/+65 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|