summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into qtquick2history/qtquick2axis2011-04-271-11/+11
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-11/+11
| |\
| | * Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-191-4/+8
| | * Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-181-11/+11
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-264-43/+46
|\| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-194-43/+46
| |\ \
| | * | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-194-43/+46
| * | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-1434-445/+489
| |\ \ \
* | \ \ \ Merge branch 'master' into qtquick2Michael Brasser2011-04-1431-334/+342
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-131-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix warnings about && inside ||Thiago Macieira2011-04-131-2/+2
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-101-3/+1
| |\ \ \ \
| | * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-101-3/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-091-3/+1
| | | |\ \ \
| | | | * | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-085-135/+128
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Get rid of double conversions and arithmetic when qreal is float.Samuel Rødal2011-04-065-135/+128
| | | |_|/ / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-041-2/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix QGradient stop with NaN position on Symbian.Laszlo Agocs2011-04-041-2/+4
| * | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-055-12/+3
| * | | | Fix positioning in GL2 paint engine with subpixel antialiasingJiang Jiang2011-04-041-1/+1
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-042-9/+9
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-9/+9
| | |\| | |
| | | * | | Fixed rounding of coordinates pre-transformation in CG paintengine.Samuel Rødal2011-03-291-1/+1
| | | * | | Fixed infinite loop in QPainterPath::intersects() when qreal=float.Samuel Rødal2011-03-281-8/+8
| | | |/ /
| * | | | Make sure we don't use subpixel positions in full hinting modeJiang Jiang2011-04-012-7/+2
| * | | | Fixed underline offset after raster coordinate system change.Samuel Rødal2011-04-011-1/+2
| * | | | Fix horizontal centered text drawing without word wrapJiang Jiang2011-03-311-5/+12
| * | | | Revert "Fixed underline offset after raster coordinate system change."Samuel Rødal2011-03-301-2/+1
| * | | | Added WindowSurfaceFeature enum to QWindowSurface.Samuel Rødal2011-03-2912-46/+41
| * | | | Added preserved contents property to QWindowSurface.Samuel Rødal2011-03-293-2/+13
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-291-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed underline offset after raster coordinate system change.Samuel Rødal2011-03-281-1/+2
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-296-138/+153
| |\| | |
| | * | | Fix remaining regressions in QWSJiang Jiang2011-03-251-2/+5
| | * | | Fixed remaining issues in subpixel positioning with FreeTypeJiang Jiang2011-03-244-132/+132
| | * | | Fix QTransform debug outputJiang Jiang2011-03-241-0/+3
| | * | | qFloor the decoration line width before paintingJiang Jiang2011-03-241-1/+1
| | * | | Let QTextLine decide its own x position in QPainterJiang Jiang2011-03-241-8/+5
| | * | | Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-231-0/+5
| | * | | Implement subpixel positioning with FreeTypeJiang Jiang2011-03-223-6/+13
* | | | | Merge remote branch 'lighthouse/master' into qtquick2Samuel Rødal2011-04-061-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | use at() instead of [] for const accessHarald Fernengel2011-04-061-1/+1
* | | | | Merge branch 'master' into qtquick2Yann Bodson2011-03-2914-138/+174
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-221-9/+19
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-201-9/+19
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-191-9/+19
| | | |\ \
| | | | * | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-181-9/+19
| * | | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-213-13/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |