summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-291-3/+7
* | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-274-5/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-243-3/+3
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-3/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-204-29/+134
| | | |\ \ | | | | |/
| | | | * Fix glyph metrics with QStaticText/Freetype/raster and light/no hintingEskil Abrahamsen Blomfeldt2011-05-311-0/+9
| | | | * Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
| | | | * Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
| | | | * Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
| | | | * Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-233-7/+74
| | | | * Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
| | | | * Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| | | * | Revert "Symbian: Fix QFontInfo::pixelSize()"Alessandro Portale2011-06-162-1/+4
| | | * | Proper naming for raster pixmap and paintengine on Symbian.Laszlo Agocs2011-06-163-3/+3
| | | * | Symbian: Fix QFontInfo::pixelSize()Alessandro Portale2011-06-142-4/+1
| | | |/
| | | * Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1796-1633/+1633
| | | |\
| | | | * Update licenseheader text in source filesJyri Tahtela2011-05-1396-1633/+1633
| * | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-2427-284/+619
| |\ \ \ \ | | |/ / /
| * | | | move some internal helper functions from qglobal.cpp to qcore_mac*Ritt Konstantin2011-06-091-2/+0
* | | | | Only compare styleNames if they are not emptyJiang Jiang2011-06-272-2/+2
* | | | | Add styleName to QFontDef comparisonJiang Jiang2011-06-252-0/+4
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-236-60/+64
|\ \ \ \
| * | | | Skip boundry neutral characters in bidi itemizationJiang Jiang2011-06-221-4/+22
| * | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-228-57/+138
| |\ \ \ \
| * | | | | Proper fix for previous deallocation problemJiang Jiang2011-06-211-4/+2
| * | | | | No need to destroy match pattern againJiang Jiang2011-06-201-1/+0
| * | | | | Fix fontconfig usage in X11 font databaseJiang Jiang2011-06-202-48/+30
| * | | | | Fix empty lines in Qt HTML when displayed in external browsers (again)Eskil Abrahamsen Blomfeldt2011-06-203-4/+11
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-221-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backendsRitt Konstantin2011-06-211-0/+5
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1722-171/+417
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-1412-97/+205
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Allow selecting fonts with irregular style namesJiang Jiang2011-06-1011-96/+204
| | * | | | Fix missing empty lines in Qt HTML when displayed in compliant browsersEskil Abrahamsen Blomfeldt2011-06-101-1/+1
| * | | | | Fix alignment value not handled in ODFThiago Macieira2011-06-141-0/+1
| |/ / / /
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-081-1/+1
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-06-061-2/+2
| | |\ \ \ \ | | | |/ / /
| | * | | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-241-1/+1
| * | | | | Fix compile when configure with no fontconfig supportJiang Jiang2011-06-081-3/+3
| * | | | | Fix warning in qtextengine compilationJiang Jiang2011-06-081-1/+1
| * | | | | Reorder member varibles in QGlyphRunPrivate to eliminate warningJiang Jiang2011-06-081-4/+4
| * | | | | Revert 36e01e69Jiang Jiang2011-06-081-4/+0