summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-122-32/+7
|\
| * Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-112-32/+7
* | Merge branch '4.6'Thiago Macieira2010-01-082-29/+39
|\ \ | |/
| * 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
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-263-10/+18
|\ \ | |/
| * 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
* | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-1/+0
* | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-153-112/+31
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ | | | |/ | | |/|
| * | | Fix crash when rotating cleartype text under gl engine.Gunnar Sletta2009-12-093-8/+13
* | | | Merge branch '4.6'Thiago Macieira2009-12-081-2/+10
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |/
* | | Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-041-0/+3
|\ \ \ | |/ /
| * | Update include path for Symbian^3Iain2009-12-031-0/+3
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-024-7/+12
|\ \ | |/
| * 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
| | |\
| * | | 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
* | | Add data: URL handling to QTextDocument::loadResourceThorvald Natvig2009-12-021-0/+5
| |/ |/|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-253-44/+69
|\ \ | |/
| * 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
| |/
* | 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
|/
* 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
| |/ /
| * | Qt covers BC break in SymbianAlessandro Portale2009-11-101-2/+25
| |/
| * Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-2/+2
| |\
| | * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-2/+2
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-066-62/+92
| |\ \
| | * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-063-48/+71
| | |\ \ | | | |/
generated by cgit v0.12 at 2024-10-27 04:39:34 (GMT)