summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-141-1/+1
|\
| * Fix possible crash in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+1
* | Converting from double to qreal in guimread2011-10-103-5/+5
|/
* Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-221-6/+9
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-201-6/+9
| |\
| | * Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-09-191-6/+9
* | | Only limit cursor position when line is wrappedJiang Jiang2011-09-211-1/+1
* | | Make sure cursor position doesn't exceed line endJiang Jiang2011-09-191-0/+3
|/ /
* | Merge remote branch 'qt-mainline/4.8'aavit2011-09-1714-93/+54
|\ \
| * \ Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1482-2332/+9603
| |\ \ | | |/
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-1011-177/+135
| | |\
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-091-5/+2
| | |\ \
| | | * | Fix double click and drag not extending word selection.Andrew den Exter2011-09-081-5/+2
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0813-88/+52
| | |\ \ \
| | | * | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0713-88/+52
| * | | | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
* | | | | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-163-5/+12
* | | | | | Do not put cursor at non-stop character positionsJiang Jiang2011-09-141-0/+3
* | | | | | doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docsEskil Abrahamsen Blomfeldt2011-09-131-1/+2
| |_|_|_|/ |/| | | |
* | | | | Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFTAleksandar Stojiljkovic2011-09-091-2/+6
* | | | | Reset trailingSpaces in relayoutJiang Jiang2011-09-091-0/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-083-5/+6
|\ \ \ \ \
| * | | | | Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-083-5/+6
* | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-084-12/+31
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-071-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-061-0/+8
| * | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3113-43/+94
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-297-44/+56
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-267-12/+42
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-184-20/+33
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-161-17/+25
| | | |\ \ \ \ \
| | * | | | | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-152-1/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-311-11/+19
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-301-11/+19
* | | | | | | | Fix RTL layout for fonts when non-printable character has an advanceJohn Tapsell2011-09-082-2/+4
* | | | | | | | Fix regression in tst_qrawfontEskil Abrahamsen Blomfeldt2011-09-081-1/+3
* | | | | | | | Make it compile on macaavit2011-09-071-3/+3
* | | | | | | | micro optimizationsKonstantin Ritt2011-09-024-109/+48
* | | | | | | | fix "comparison between signed and unsigned" warningsKonstantin Ritt2011-09-021-7/+5
* | | | | | | | on windows, don't resolve the gdi32's symbols for each QRawFont instanceKonstantin Ritt2011-09-022-37/+26
* | | | | | | | fix typo in the docsKonstantin Ritt2011-09-021-1/+1
* | | | | | | | QRawFont: add missed operator !=Konstantin Ritt2011-09-022-0/+9
* | | | | | | | optimize QGlyphRun's operator == a bitKonstantin Ritt2011-09-021-7/+11
* | | | | | | | QGlyphRun: make operator != inlinedKonstantin Ritt2011-09-022-5/+5
* | | | | | | | QGlyphRun: don't detach if the decoration wasn't actually changedKonstantin Ritt2011-09-021-0/+9
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-285-13/+23
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-245-13/+23
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | * | | | | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| | * | | | | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-243-7/+20