summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-212-2/+9
|\
| * Move separator skipping to proper placeJiang Jiang2011-07-192-6/+7
| * Skip shaping for hidden line/paragraph separatorsJiang Jiang2011-07-191-0/+6
| * Apply 57993ba7 properly to 4.8Jiang Jiang2011-07-141-1/+1
| * Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
* | namespace fixJoerg Bornemann2011-07-141-1/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-141-0/+1
|\ \
| * | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
| * | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6
| * | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| * | Optimize text layout.Michael Brasser2011-07-113-25/+71
| * | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * | Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-125-23/+33
|\ \ \ | | |/ | |/|
| * | Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| * | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * | Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-081-1/+1
| * | Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-071-3/+4
| * | Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| * | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-073-165/+73
| |\ \
* | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-084-4/+18
|\ \ \ \
| * \ \ \ Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-083-165/+73
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-304-4/+18
* | | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-083-165/+73
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-022-162/+66
| |\ \ \
| | * | | Compile with DEBUG_FONTENGINE defineHarald Fernengel2011-07-011-4/+4
| | * | | minor optimizationRitt Konstantin2011-07-011-2/+2
| | * | | remove the old compatibility codeRitt Konstantin2011-07-011-95/+2
| | * | | make QFontEngineQPF1 work even without mmap(2) supportRitt Konstantin2011-07-011-62/+59
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-3/+7
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-291-3/+7
| | |\ \
| | | * | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-291-3/+7
* | | | | Fix S60 compileJiang Jiang2011-07-061-1/+1
* | | | | Remove some metrics parsing code from Core TextJiang Jiang2011-07-062-20/+3
* | | | | Fix Windows compileJiang Jiang2011-07-061-1/+1
* | | | | Move styleName out of QtFontStyle::KeyJiang Jiang2011-07-065-46/+57
* | | | | Fix regressions in previous QFontDatabase patchJiang Jiang2011-07-051-12/+8
* | | | | Store styleName in font databaseJiang Jiang2011-07-043-12/+38
* | | | | Fix resource leak in QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-06-301-2/+3
* | | | | Fix transformations on DirectWrite rasterized textEskil Abrahamsen Blomfeldt2011-06-302-47/+104
|/ / / /
* | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-274-5/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-243-3/+3
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-3/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-204-29/+134
| | | |\ \ | | | | |/
| | | | * Fix glyph metrics with QStaticText/Freetype/raster and light/no hintingEskil Abrahamsen Blomfeldt2011-05-311-0/+9
| | | | * Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
| | | | * Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
| | | | * Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
| | | | * Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-233-7/+74
| | | | * Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2