summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-037-19/+51
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-021-8/+28
| |\
| | * Symbian: return better default font for SansSerif style hintAlessandro Portale2010-09-021-0/+27
| | * Removing a left over #if 1..#endif constructAlessandro Portale2010-09-021-8/+1
| * | Fix broken S60 buildJiang Jiang2010-09-022-1/+7
| * | Keep mirrored char handling consistent between some font enginesJiang Jiang2010-09-023-5/+1
| * | Fix symbol font detection in generic CMap decodingJiang Jiang2010-09-021-2/+2
| |/
| * Fix compiling issue for FreeType version earlier than 2.1.10Jiang Jiang2010-09-011-2/+9
| * QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-022-3/+4
|\ \ | |/ |/|
| * Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-311-2/+3
| * Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | Correct last right bearing in boundingBox(glyphs)Jiang Jiang2010-08-277-17/+26
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-244-16/+35
|\
| * Ignore LayoutDirectionChange event in QTextControlJiang Jiang2010-08-191-8/+0
| * respect the layout direction in the default text optionLars Knoll2010-08-181-0/+4
| * Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| * doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
| * Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-091-4/+17
* | Use binarysort to find items.Gunnar Sletta2010-08-242-14/+29
|/
* Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-053-33/+87
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-021-3/+29
|\
| * Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-021-3/+29
* | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
|/
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+4
|\
| * Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-07-271-1/+4
* | 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 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