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-07-21 | 2 | -2/+9 |
|\ | |||||
| * | Move separator skipping to proper place | Jiang Jiang | 2011-07-19 | 2 | -6/+7 |
| * | Skip shaping for hidden line/paragraph separators | Jiang Jiang | 2011-07-19 | 1 | -0/+6 |
| * | Apply 57993ba7 properly to 4.8 | Jiang Jiang | 2011-07-14 | 1 | -1/+1 |
| * | Fix warning for uninitialized variable | Jiang Jiang | 2011-07-12 | 1 | -1/+1 |
* | | namespace fix | Joerg Bornemann | 2011-07-14 | 1 | -1/+2 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-14 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix potential crash when clicking in a text edit | Eskil Abrahamsen Blomfeldt | 2011-07-13 | 1 | -0/+1 |
| * | | Check engine existence before increasing reference count | Jiang Jiang | 2011-07-12 | 1 | -3/+6 |
| * | | Keep reference count for cached font engines in QTextEngine | Jiang Jiang | 2011-07-11 | 1 | -0/+15 |
| * | | Optimize text layout. | Michael Brasser | 2011-07-11 | 3 | -25/+71 |
| * | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| * | | Fix horizontal center alignment with trailing space | Jiang Jiang | 2011-07-04 | 1 | -1/+1 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-12 | 5 | -23/+33 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix compiler warning in qtextdocument.cpp | Eskil Abrahamsen Blomfeldt | 2011-07-11 | 1 | -1/+1 |
| * | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| * | | Use truncate only for subpixel boundingBox x position | Jiang Jiang | 2011-07-08 | 1 | -1/+1 |
| * | | Revert 344a4dcfe and part of 93bce787 | Jiang Jiang | 2011-07-07 | 1 | -3/+4 |
| * | | Fix raster subpixel positioning in Lion | Jiang Jiang | 2011-07-07 | 1 | -1/+1 |
| * | | Merge remote branch 'mainline/4.8' | Jiang Jiang | 2011-07-07 | 3 | -165/+73 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-08 | 4 | -4/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 3 | -165/+73 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 4 | -4/+18 |
* | | | | | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 3 | -165/+73 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-07-02 | 2 | -162/+66 |
| |\ \ \ | |||||
| | * | | | Compile with DEBUG_FONTENGINE define | Harald Fernengel | 2011-07-01 | 1 | -4/+4 |
| | * | | | minor optimization | Ritt Konstantin | 2011-07-01 | 1 | -2/+2 |
| | * | | | remove the old compatibility code | Ritt Konstantin | 2011-07-01 | 1 | -95/+2 |
| | * | | | make QFontEngineQPF1 work even without mmap(2) support | Ritt Konstantin | 2011-07-01 | 1 | -62/+59 |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-01 | 1 | -3/+7 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-06-29 | 1 | -3/+7 |
| | |\ \ | |||||
| | | * | | Fix text color in some cases of QML and QStaticText | Eskil Abrahamsen Blomfeldt | 2011-06-29 | 1 | -3/+7 |
* | | | | | Fix S60 compile | Jiang Jiang | 2011-07-06 | 1 | -1/+1 |
* | | | | | Remove some metrics parsing code from Core Text | Jiang Jiang | 2011-07-06 | 2 | -20/+3 |
* | | | | | Fix Windows compile | Jiang Jiang | 2011-07-06 | 1 | -1/+1 |
* | | | | | Move styleName out of QtFontStyle::Key | Jiang Jiang | 2011-07-06 | 5 | -46/+57 |
* | | | | | Fix regressions in previous QFontDatabase patch | Jiang Jiang | 2011-07-05 | 1 | -12/+8 |
* | | | | | Store styleName in font database | Jiang Jiang | 2011-07-04 | 3 | -12/+38 |
* | | | | | Fix resource leak in QFontEngineDirectWrite | Eskil Abrahamsen Blomfeldt | 2011-06-30 | 1 | -2/+3 |
* | | | | | Fix transformations on DirectWrite rasterized text | Eskil Abrahamsen Blomfeldt | 2011-06-30 | 2 | -47/+104 |
|/ / / / | |||||
* | | | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-06-27 | 4 | -5/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-24 | 3 | -3/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 3 | -3/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 4 | -29/+134 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting | Eskil Abrahamsen Blomfeldt | 2011-05-31 | 1 | -0/+9 |
| | | | * | Fix boundry conditions for cursor hit test | Jiang Jiang | 2011-05-25 | 1 | -1/+1 |
| | | | * | Fix cursor position test on CursorOnCharacter case | Jiang Jiang | 2011-05-25 | 3 | -4/+9 |
| | | | * | Fix xToCursor issue due to backporting from 4.8 | Jiang Jiang | 2011-05-24 | 1 | -0/+2 |
| | | | * | Support placing cursor in ligature with mouse or touch | Jiang Jiang | 2011-05-23 | 3 | -7/+74 |
| | | | * | Fix ligature offset in multi-line text | Jiang Jiang | 2011-05-20 | 1 | -2/+2 |