summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Doc: Fixed qdoc warnings.David Boddie2011-08-156-10/+42
* 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
| * | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * | Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-081-1/+1
| * | Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-071-3/+4
| * | Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| * | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-073-165/+73
| |\ \
* | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-084-4/+18
|\ \ \ \
| * \ \ \ Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-083-165/+73
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-304-4/+18
* | | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-083-165/+73
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-022-162/+66
| |\ \ \
| | * | | Compile with DEBUG_FONTENGINE defineHarald Fernengel2011-07-011-4/+4
| | * | | minor optimizationRitt Konstantin2011-07-011-2/+2
| | * | | remove the old compatibility codeRitt Konstantin2011-07-011-95/+2
| | * | | make QFontEngineQPF1 work even without mmap(2) supportRitt Konstantin2011-07-011-62/+59
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-3/+7
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-291-3/+7
| | |\ \