summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1012-25/+87
|\
| * consistent handling of directionality in QTextLayoutLars Knoll2010-06-093-15/+23
| * correctly initialize the bidi level in the text engineLars Knoll2010-06-091-2/+15
| * Use the textDirection() of blocks correctly.Lars Knoll2010-06-094-14/+7
| * Add QTextBlock::textDirection()Lars Knoll2010-06-092-0/+45
| * Make sure LayoutDirectionAuto is the default text directionLars Knoll2010-06-091-2/+5
| * The default text direction for QTextOption is Qt::LayoutDirectionAutoLars Knoll2010-06-092-3/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Toby Tomkins2010-06-101-2/+2
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-2/+2
| |\
| | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-272-0/+2
* | | Problems with missing symbols on QWS/AIX. Include freetype synthesis file for...Toby Tomkins2010-06-101-0/+1
|/ /
* | Retrieve proper glyph outlines from Symbian^4Alessandro Portale2010-06-072-2/+103
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-041-29/+29
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-041-29/+29
| |\ \
| | * | Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-042-3/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-032-3/+13
| |\ \ \ | | |/ / | |/| |
| | * | Changes: add patch for artificial emboldeningMike FABIAN2010-06-022-3/+13
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-033-35/+137
|\ \ \ \ | |/ / / |/| | |
| * | | Using Symbian's future font table getter ApiAlessandro Portale2010-06-033-35/+137
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-024-1/+34
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-014-1/+34
| |\ \
| | * | Add the Qt::TextBypassShaping flag.Jocelyn Turcotte2010-05-314-0/+33
| | * | QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.Jocelyn Turcotte2010-05-311-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-013-7/+89
|\ \ \ \
| * | | | Introduced getter and setter for the visual X cursor position.Roberto Raggi2010-06-012-0/+38
| * | | | Defines whether the cursor should keep its current position.Roberto Raggi2010-06-013-7/+51
| |/ / /
* | | | Speed up QStaticText with affine transformation on GL2 engineEskil Abrahamsen Blomfeldt2010-06-012-17/+27
|/ / /
* | | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-311-1/+2
* | | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-311-1/+1
|/ /
* | Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
* | Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
* | Fix crash when using fonts in non-gui QApplicationEskil Abrahamsen Blomfeldt2010-05-201-2/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-191-0/+8
|\ \
| * \ Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-192-0/+4
| |\ \
| * | | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-192-6/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix platform regression: Support QFont::setStretch() on CocoaEskil Abrahamsen Blomfeldt2010-05-192-6/+15
| |/ /
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-172-0/+4
|\ \ \ | |/ / |/| / | |/
| * Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| * Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
* | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-05-106-92/+88
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-022-3/+16
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-022-3/+16
| | |\ \
| * | \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-014-50/+45
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-011-17/+40
| | |\ \
| | | * | Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-301-6/+3
| | |\ \ \ | | | |/ / | | |/| |