summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextlayout.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-011-1/+5
|\
| * Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-291-4/+15
|\ \ | |/ |/|
| * Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15
| * Reset previousGlyph once we reached a new text itemJiang Jiang2011-07-251-0/+1
| * Optimize text layout.Michael Brasser2011-07-111-6/+8
| * Fix crash when app font is addedJiang Jiang2011-07-111-4/+4
| * Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
| * Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-251-2/+4
| * 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-231-7/+5
| * Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
| * Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| * Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| * Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-191-18/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-121-4/+4
|\ \
| * | Fix crash when app font is addedJiang Jiang2011-07-111-4/+4
* | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-4/+12
|/ /
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-12/+26
|\ \
| * | Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-061-3/+13
| * | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-061-17/+17
| |\ \
| * | | Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-251-2/+4
| * | | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-231-7/+9
| * | | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-37/+40
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-18/+18
| |\ \ \ | | |/ /
| | * | Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-111-7/+7
| | * | Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-101-11/+11
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-051-0/+3
| |\ \
| | * | Fix glyph position issue with fallback fontsJiang Jiang2011-04-291-0/+3
* | | | Doc: Fixed qdoc warnings.David Boddie2011-05-111-5/+5
|/ / /
* | | Merge earth-team into origin/4.8Olivier Goffart2011-05-031-256/+139
|\ \ \ | |/ /
| * | Take leading space width into account for painting and selectionJiang Jiang2011-04-261-0/+1
| * | Support visual cursor movement for BIDI textJiang Jiang2011-04-191-256/+138
| * | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-151-11/+47
* | | Fixes warnings about unused variablesOlivier Goffart2011-04-281-2/+0
* | | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-191-11/+47
|/ /
* | Fix horizontal centered text drawing without word wrapJiang Jiang2011-03-311-18/+1
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-22/+25
|\ \ | |/
| * Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-241-4/+19
| |\
| * | Use binarysort to find items.Gunnar Sletta2010-08-241-7/+17
* | | Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-9/+33
|\ \ \ | | |/ | |/|
| * | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2