| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-01 | 1 | -6/+9 |
|\ |
|
| * | Fix text color in some cases of QML and QStaticText | Eskil Abrahamsen Blomfeldt | 2011-06-29 | 1 | -6/+9 |
|
|
| * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
|
|
* | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-27 | 1 | -2/+13 |
|\ \
| |/ |
|
| * | Support text decoration in QML when using static text back-end | Eskil Abrahamsen Blomfeldt | 2011-04-18 | 1 | -0/+10 |
|
|
| * | Fix missing color in text when using static text back-end in QML | Eskil Abrahamsen Blomfeldt | 2011-04-18 | 1 | -2/+3 |
|
|
* | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 1 | -3/+0 |
|/ |
|
* | Don't assert if font engine creates new glyphs | Aaron Kennedy | 2011-03-02 | 1 | -5/+6 |
|
|
* | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
|
|
* | Change pen correctly when drawing cached text | Aaron Kennedy | 2010-12-01 | 1 | -0/+8 |
|
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-10 | 1 | -2/+2 |
|\ |
|
| * | Fix possible crash in QStaticText and QDeclarativeTextLayout | Eskil Abrahamsen Blomfeldt | 2010-10-29 | 1 | -2/+2 |
|
|
* | | Regression: QDeclarativeText does not update when text turns empty | Yann Bodson | 2010-11-03 | 1 | -0/+13 |
|/ |
|
* | Fix QDeclarativeTextLayout under non-affine transformation | Aaron Kennedy | 2010-10-18 | 1 | -1/+1 |
|
|
* | Add missing license header. | Michael Brasser | 2010-10-04 | 1 | -0/+41 |
|
|
* | Compile | Aaron Kennedy | 2010-10-04 | 1 | -0/+4 |
|
|
* | Only cache textlayout in paint engines that support transformations | Aaron Kennedy | 2010-10-01 | 1 | -1/+6 |
|
|
* | Apply the QStaticText text-caching strategy for QML | Aaron Kennedy | 2010-10-01 | 1 | -0/+308 |
|
|