summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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 '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 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-161-0/+1
| |\ \
| | * | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
* | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-162-3/+7
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-3/+7
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-051-1/+1
| | |\
| | | * Fix compile errors on S60 3.2Shane Kearns2011-08-051-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
| | |\ \
| | | * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
* | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
* | | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
|/ / / /
* | | | 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
| | * | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-226-5/+21
| | |\ \ \ \
| | * | | | | Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-217-13/+13
| | * | | | | Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-212-0/+12
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-021-21/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-294-27/+84
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
| |\ \ \ \
| | * | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-271-4/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15
| | * | | | Reset previousGlyph once we reached a new text itemJiang Jiang2011-07-251-0/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-272-9/+62
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Symbian^3 workaround: Avoid usage of linked fonts.Alessandro Portale2011-07-272-9/+62
| | | |/ | | |/|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-212-2/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Move separator skipping to proper placeJiang Jiang2011-07-192-6/+7
| * | | Skip shaping for hidden line/paragraph separatorsJiang Jiang2011-07-191-0/+6
| * | | Apply 57993ba7 properly to 4.8Jiang Jiang2011-07-141-1/+1
| * | | Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
* | | | namespace fixJoerg Bornemann2011-07-141-1/+2
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-141-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
| * | | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6
| * | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| * | | Optimize text layout.Michael Brasser2011-07-113-25/+71
| * | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * | | Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
| | |/ | |/|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-125-23/+33
|\ \ \ | | |/ | |/|
| * | Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
generated by cgit v0.12 at 2025-02-22 06:23:45 (GMT)