summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| | * Fixed many spelling errors.Rohan McGovern2010-10-256-8/+8
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-2/+19
| |\ \ | | |/
| | * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-227-48/+98
|\ \ \ | |/ /
| * | Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-26/+45
| |\ \ | | |/
| | * Remove obsolete tweak in QFontEngineS60::alphaMapForGlyphAlessandro Portale2010-10-121-17/+5
| | * Optimize QFontEngineS60::recalcAdvances()Alessandro Portale2010-10-121-3/+6
| | * Implement QFontEngineS60::emSquareSize()Alessandro Portale2010-10-122-0/+29
| | * Remove unnecessary calls to GetHorizBounds() + boundingBox()Alessandro Portale2010-10-121-6/+4
| | * Fix memory leak in QFontEngineS60::addGlyphsToPath()Alessandro Portale2010-10-121-0/+1
| * | Fix text position with OpenGL engine and FreetypeEskil Abrahamsen Blomfeldt2010-10-123-12/+37
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-091-6/+10
| |\ \ | | |/
| | * Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-058-24/+40
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-055-17/+23
| |\ \ | | |/
| | * Moving QPdf::stripSpecialCharacter to fontengineJørgen Lind2010-09-305-17/+23
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-1/+17
| |\ \ | | |/
| | * Fix QFontMetrics::lineWidth() for fonts with defined point sizeAlessandro Portale2010-09-281-1/+7
| | * Implemeting, exporting and autotesting QFont::lastResortFont()Alessandro Portale2010-09-281-0/+10
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-6/+0
| |\ \ | | |/
| | * Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-303-3/+9
|\ \ \
| * | | Lighthouse: Make application fonts workJørgen Lind2010-09-303-3/+9
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2714-65/+77
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-222-2/+0
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-2/+0
| | |\ \ \ | | | | |/ | | | |/|