summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextlayout.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge remote branch 'origin/master'Olivier Goffart2010-06-151-2/+2
|\ \ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-081-2/+2
| |\ \ \ | | |/ /
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-2/+2
| | |\ \ | | | |/
| | | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-271-0/+1
* | | | New class: QGlyphsEskil Abrahamsen Blomfeldt2010-06-041-0/+136
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-011-1/+2
|\ \ \ | |/ /
| * | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-311-1/+2
| * | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-311-1/+1
* | | Use binarysort to find items.Gunnar Sletta2010-05-211-7/+17
|/ /
* | Simplify docs a bitThomas Zander2010-04-161-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-3/+3
|\ \ | |/
| * Recommit 1ebeb971d3382aec0fff927Eskil Abrahamsen Blomfeldt2010-03-221-3/+3
* | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-231-0/+14
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-41/+82
|\ \ | |/
| * Revert "Optimize getting bearings of a glyph on Windows for true type fonts"Olivier Goffart2010-03-191-3/+3
| * Optimize getting bearings of a glyph on Windows for true type fontsEskil Abrahamsen Blomfeldt2010-03-171-3/+3
| * Optimize speed of QTextLayout and QPainter::drawTextEskil Abrahamsen Blomfeldt2010-03-171-40/+82
* | Fix alignment of text with negative right bearingEskil Abrahamsen Blomfeldt2010-03-091-0/+2
|/
* Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* Line spacing fixesJoerg Bornemann2009-10-231-12/+64
* Only account for a negative right bearing in QTextLayoutEskil Abrahamsen Blomfeldt2009-09-241-1/+1
* Fix breaking on fixed column width when text has tabsEskil Abrahamsen Blomfeldt2009-09-221-2/+7
* If the font does not exist, then the right bearing becomes to bigJørgen Lind2009-09-141-1/+2
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Take right bearing of glyphs into account when doing text layoutEskil Abrahamsen Blomfeldt2009-09-081-54/+101
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13