summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-064-46/+101
| * | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06117-2001/+2002
| |\ \ \ | | | |/ | | |/|
| | * | Fix build in C++0x modeBernhard Rosenkraenzer2011-05-311-2/+2
| | |/
| * | Correct antialias disabling logic for Core TextJiang Jiang2011-06-041-3/+2
| * | Keep line consistency with text baselineJiang Jiang2011-05-301-4/+4
| * | Fix compile for systems with old fontconfigJiang Jiang2011-05-271-0/+5
| * | Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
| * | Fix QFontEngineX11FT compilationJiang Jiang2011-05-251-0/+2
| * | Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
| * | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-233-7/+77
| * | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
| * | Workaround a bug in Core Text to select Light fontsJiang Jiang2011-05-161-1/+6
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24119-2351/+2376
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1822-171/+230
| |\ \
| | * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-174-9/+10
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-131-1/+1
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
| | | | |\
| | | | | * Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
| | | * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| | | | |\ \ | | | | | |/
| | | | | * Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-121-1/+3
| | | | | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-279-52/+76
| | | | | |\
| | | * | | \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-063-7/+6
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | memory leak fixTero Toivola2011-05-031-0/+4
| | | | * | | Revert symbol addition in b033bb9Jiang Jiang2011-04-292-7/+2
| | * | | | | Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-119-31/+27
| | * | | | | Add some QRawFont related low level functions to avoid extra copyingJiang Jiang2011-05-102-5/+55
| | * | | | | Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| | * | | | | Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-109-120/+121