summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-032-12/+0
* Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-024-4/+46
* Minor optimizationSimon Hausmann2010-07-301-1/+1
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-289-27/+49
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-212-4/+2
| |\
| | * doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-202-4/+2
| * | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+0
| |\ \ | | |/ | |/|
| | * Fixed QT_NO_FREETYPE define.axis2010-07-211-2/+0
| * | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-183-9/+9
| * | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-174-9/+34
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-161-1/+1
| | |\ \
| | | * | Fix RightBearing confusion in text layoutmae2010-07-161-1/+1
| | | |/
| | * | Fix an Assert in QTextTablePierre Rossi2010-07-141-4/+24
| | * | Revert "Fix an Assert in QTextTable"Aaron McCarthy2010-07-141-24/+4
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-131-4/+24
| | |\ \
| | | * | Fix an Assert in QTextTablePierre Rossi2010-07-131-4/+24
| | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-131-3/+3
| | |/ /
| | * | Fixing merge conflicts.Martin Smith2010-07-136-27/+46
| | |\ \ | | | |/
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-101-1/+6
| | |\ \
| | | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-3/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix crash when removing columns in merged rowEskil Abrahamsen Blomfeldt2010-07-071-3/+4
* | | | | Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-151-10/+31
|\ \ \ \ \
| * | | | | Support RTL text in QGlyphsEskil Abrahamsen Blomfeldt2010-07-141-1/+4
| * | | | | Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-141-9/+27
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-1514-31/+83
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-121-1/+2
| |\ \ \ \
| | * | | | Enable cross-process glyph cache for OpenVG graphics system on Symbian.Jason Barron2010-07-121-1/+1
| | * | | | Add new file for Symbian specific VG stuff and add Symbian glyph cache.Jason Barron2010-07-121-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-105-26/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix QTextDocument::markContentsDirty()mae2010-07-091-4/+4
| | * | | Fix crashmae2010-07-082-1/+5
| | * | | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-082-3/+16
| | * | | Revert "Fix exponential behavior of QTextCursor::removeSelectedText"Michael Brasser2010-07-072-8/+0
| | * | | Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursorsChristian Kamm2010-07-064-21/+22
| | * | | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | | |/ | | |/|
| * | | Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-07-086-1/+34
| |/ /
| * | Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-292-3/+3
* | | Make QFontEngineGlyphCache explicitly sharedEskil Abrahamsen Blomfeldt2010-07-123-9/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-092-2/+2
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-082-2/+2
| |\ \ \
| | * | | Make QScriptAnalysis fit in two bytes againEskil Abrahamsen Blomfeldt2010-07-061-1/+1
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-061-1/+1
| | |\ \ \
| | | * | | Enable glyph uploads from a thread in the X11 font engine.Trond Kjernåsen2010-07-021-1/+1
* | | | | | Optimize text layout.Michael Brasser2010-07-093-25/+71
|/ / / / /
* | | | | Make the QScriptLine bit field fit in 4 bytes again.Michael Brasser2010-07-061-2/+2
|/ / / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-0123-87/+268
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-06-241-1/+1
| |\ \
| | * | Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
| * | | Don't crash when cleaning the uninitialized fontdatabase (Symbian)Alessandro Portale2010-06-241-0/+2
| |/ /