summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Make sure we define S_IFDIR on WindowsThomas Zander2010-02-041-3/+6
* Fix copy/pastoThomas Zander2010-02-042-2/+2
* Fixed text rendering via scaled QPainter on rasterPaintEngine / SymbianAlessandro Portale2010-02-012-18/+60
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-281-3/+0
|\
| * Remove left over forward declarationsAlessandro Portale2010-01-281-3/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-281-0/+5
|\ \ | |/ |/|
| * doc: Specified default values for constructors.Martin Smith2010-01-271-0/+5
* | Removing unneeded code from QFontEngine::getGlyphPositions()Alessandro Portale2010-01-271-3/+0
|/
* Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ...Warwick Allison2010-01-141-1/+9
* Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1293-125/+100
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1293-93/+93
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0793-93/+93
| | |\
| | | * Update copyright year to 2010Jason McDonald2010-01-0693-93/+93
| * | | Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-112-32/+7
| |/ /
* | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-111-2/+1
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-061-3/+10
|\ \ | |/ |/|
| * Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| * Fix background brush for character format when writing to ODF document.Pierre Rossi2009-12-301-1/+8
* | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
|/
* Edit focus should not be lost unless by explicit actionSami Merila2009-12-211-1/+5
* Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-171-7/+7
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-141-2/+10
| |\
| * | Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.David Boddie2009-12-071-7/+7
* | | Fix vertical text centering on Mac OS XEskil Abrahamsen Blomfeldt2009-12-151-2/+6
* | | Clean up the QFontEngine glyphcaching code to not crash and be more tidyGunnar Sletta2009-12-102-114/+28
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-092-2/+13
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-071-2/+10
| |\ \ | | |/ | |/|
| | * Fix cursor positiong after block undo and redomae2009-12-041-2/+10
| * | Update include path for Symbian^3Iain2009-12-031-0/+3
| |/
* | Fix crash when rotating cleartype text under gl engine.Gunnar Sletta2009-12-093-8/+13
|/
* X11: Avoid loading all fonts in system for text with line breaksEskil Abrahamsen Blomfeldt2009-11-301-1/+1
* Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-271-5/+4
|\
| * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-272-0/+4
| |\
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-253-44/+69
| |\ \
| * | | Incorrect background while composing Japanese text(e.g 'shi' + <space>).Prasanth Ullattil2009-11-241-4/+2
| * | | Softkeys: Text disappears from textbox when predictive text is active.Samuel Nevala2009-11-241-1/+2
* | | | Correctly export the horizontal part of a mixed alignment in text.Thomas Zander2009-11-271-6/+7
| |_|/ |/| |
* | | Fix compilation on Windows CEEskil Abrahamsen Blomfeldt2009-11-272-0/+4
| |/ |/|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-231-0/+6
|\ \
| * | Fixed endless loop when printing a QTextDocument.Trond Kjernåsen2009-11-231-0/+6
| |/
* | Fix positioning of diacritics in .otf fonts on WindowsEskil Abrahamsen Blomfeldt2009-11-232-44/+63
|/
* Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-191-3/+19
* Fix regression in emitting of QTextDocument::undoCommandAdded()Thomas Zander2009-11-161-1/+3
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-133-22/+62
|\
| * Speed up QTextFormatCollection::indexForFormatJos van den Oever2009-11-132-21/+59
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-131-1/+3
| |\
| | * Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-111-1/+3
| | |\
| | | * Small caps font variant wouldn't be used when defined through style sheetsGabriel de Dietrich2009-11-111-1/+3
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-138-23/+55
|\ \ \ \ | |/ / /
| * | | Fix typo in license headerAlessandro Portale2009-11-124-4/+4
| |/ /