summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1796-112/+112
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1196-97/+97
| |\
| | * QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
| | * Update copyright year to 2011.Jason McDonald2011-01-1196-96/+96
| * | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-101-2/+2
| |\ \ | | |/ | |/|
| | * Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-086-6/+6
| |\ \
| | * | Doc: Fixing typoSergio Ahumada2011-01-076-6/+6
| | |/
| * / improve performance of QTextEngine, esp. setBoundary by using non-detaching o...Milian Wolff2010-12-231-7/+7
| |/
* | Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
* | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1
* | Make application font family names locale sensitive in X11Jiang Jiang2011-01-062-2/+24
* | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeightEskil Abrahamsen Blomfeldt2011-01-044-15/+11
* | Add line spacing to QTextBlockFormat, get/set functions, CSS supportJoshua Grauman2011-01-046-6/+154
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-144-150/+186
|\ \
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-134-150/+186
| |\|
| | * Runtime dependency on Symbians Font Table APIAlessandro Portale2010-12-093-147/+181
| | * Fix crash in QTextDocument::markContentsDirtyJiang Jiang2010-12-061-2/+4
* | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2010-12-131-1/+4
|/ /
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-092-1/+12
|\ \
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-071-0/+3
| |\|
| | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-1/+9
| |\|
| | * Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | * Doc: Fixing typoSergio Ahumada2010-11-221-1/+1
* | | Fix boundingBox for raster engine with synthesized italic fontsJiang Jiang2010-12-091-5/+8
|/ /
* | Restore patch that got lost in mergeJørgen Lind2010-12-022-3/+66
* | Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-1/+1
|\ \
| * | Doc: Fixing typoSergio Ahumada2010-11-221-1/+1
* | | Adding some documentation for LighthouseJørgen Lind2010-11-221-0/+49
* | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-223-15/+12
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1910-15/+104
|\| |
| * | Fix fontconfig pattern mergingJiang Jiang2010-11-181-0/+7
| * | Fix bidi PDF mark support in Core Text shaperJiang Jiang2010-11-161-0/+18
| * | Fix cursor position of one digit after RTL textJiang Jiang2010-11-151-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-151-1/+1
| |\ \
| | * | Fix text rendering offset for raster engine on MacJiang Jiang2010-11-121-1/+1
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-10/+66
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-292-10/+66
| * | Fix for font engines that don't support subpixel positioningJiang Jiang2010-11-113-5/+20
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-104-7/+13
| |\ \
| | * | Fix warningsOlivier Goffart2010-11-101-4/+4
| | * | Support glyph subpixel positioning without subpixel renderingJiang Jiang2010-11-103-3/+9
| * | | Update the text cursor's position for input method events.Pierre Rossi2010-11-102-0/+4
| |/ /
* / / Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-289-888/+988
|/ /
* | Fix the license in files for LighthouseJørgen Lind2010-10-283-0/+123
* | Add missing QT_MODULE macros.Paul Olav Tvete2010-10-281-0/+2
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-266-10/+27
|\ \
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-256-8/+8
| |\|