summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextlayout.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-091-4/+17
| |/
| * Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-051-5/+14
* | Make selection work across ligaturesJiang Jiang2010-08-101-21/+43
* | Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-021-3/+12
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-1/+1
|\ \ | |/
| * Fix RightBearing confusion in text layoutmae2010-07-161-1/+1
* | Support RTL text in QGlyphsEskil Abrahamsen Blomfeldt2010-07-141-1/+4
* | Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-141-9/+27
* | Optimize text layout.Michael Brasser2010-07-091-6/+8
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-26/+37
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211-20/+23
| |\
| | * Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-3/+11
| |\ \ | | |/ | |/|
| | * Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-171-3/+11
| * | consistent handling of directionality in QTextLayoutLars Knoll2010-06-091-3/+3
* | | minor documentation improvementsRitt Konstantin2010-06-281-85/+94
* | | nano optimizationsRitt Konstantin2010-06-281-3/+5
* | | fix possible crash in nextCursorPosition()/previousCursorPosition()Ritt Konstantin2010-06-281-13/+12