summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ | | | |/
| | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-051-1/+2
| | |\ \
| | * | | Fix textControl so that it ignores mouse press events when neededThierry Bastian2009-11-052-12/+16
| | * | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-046-39/+71
| | |\ \ \
| | * | | | QCSSParser: Fixes the way spaces are handled in font family.Olivier Goffart2009-11-021-2/+5
| * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-043-40/+38
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | QPlainTextEdit redraw issue in QTextControlmae2009-11-041-1/+3
* | | | | | Add option to ingore unused navigation events in QTextControlEskil Abrahamsen Blomfeldt2009-11-113-7/+31
* | | | | | Printing QTextDocument doesn't include custom objects.Samuel Rødal2009-11-113-0/+9
* | | | | | CompileEskil Abrahamsen Blomfeldt2009-11-101-1/+1
* | | | | | Removed redundant line of code.Kim Motoyoshi Kalland2009-11-101-2/+1
* | | | | | Pixelalign circles in HTML bullet listsGunnar Sletta2009-11-091-1/+1
* | | | | | Fixed inconsistent coloring of bullets, circles and square listsGunnar Sletta2009-11-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | CompileEskil Abrahamsen Blomfeldt2009-11-061-1/+1
* | | | | add support for the N'Ko writing system to QtLars Knoll2009-11-063-47/+70
| |/ / / |/| | |
* | | | Merge branch '4.6-s60' into 4.6axis2009-11-041-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed an input method bug when erasing the last character.axis2009-11-031-1/+2
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-039-46/+78
|\ \ \ \ | |/ / /
| * | | fix font height calculation on QWSJoerg Bornemann2009-11-031-1/+1
| |/ /
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-026-45/+44
| |\ \
| | * \ Merge commit 'origin/4.6' into featureJørgen Lind2009-11-027-50/+47
| | |\ \ | | | |/
| | | * Merge commit 'widget/4.6' into origin/4.6Olivier Goffart2009-10-305-45/+42
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-281-8/+10
| | | | |\
| | | | | * Qt::escape(): also escape the quote (")Olivier Goffart2009-10-281-22/+5
| | | | | * Fix XML entities in QTextDocument::toHtml()Thorvald Natvig2009-10-281-7/+26
| | | | * | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-10-2815-45/+132
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | * | Always use QExplicitlySharedDataPointer<QFontPrivate>Andreas Kling2009-10-274-37/+32
| | * | | | Fix LIBRARY and ICONJørgen Lind2009-10-291-0/+2
| | | |_|/ | | |/| |
| * | | | Merge commit 'mainline/4.6' into 4.6hjk2009-10-302-5/+5
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | introduce int QTextDocument::available{Undo,Redo}Steps() const;hjk2009-10-303-0/+33
| | |/ / | |/| |
* | | | Avoid infinite loop when laying out text with unconvertible charsEskil Abrahamsen Blomfeldt2009-10-291-38/+35
| |/ / |/| |
* | | Cocoa: Synthesize italic text correct way when adding glyphs to pathEskil Abrahamsen Blomfeldt2009-10-261-1/+1
* | | Fixed PDF generation for Windows.Trond Kjernaasen2009-10-261-4/+4
|/ /
* | Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
* | Compile on QWSAnders Bakken2009-10-231-1/+1
* | Line spacing fixesJoerg Bornemann2009-10-2314-43/+130
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-231-75/+16
|\ \ | |/
| * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16