summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | |\ \ | | | |/ | | |/|
| | * | 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-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
| * | | | 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 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
| | | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-272-31/+33
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-267-12/+42
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-196-10/+42
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Doc: Fixed qdoc warnings.David Boddie2011-08-156-10/+42
| | | | | |/ | | | | |/|
| | | * | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-161-0/+1
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-162-3/+7
| | | |\ \ \ \
| | | * | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| | * | | | | | 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
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | / / / | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-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
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-262-31/+33
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-161-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-3/+7
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0310-18/+45
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-0110-18/+45
| | |\ \ \ \ \
| | | * | | | | Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
| | | * | | | | optimize QRawFont::supportsCharacter()Ritt Konstantin2011-07-222-4/+15