summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1715-41/+54
|\
| * Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-22/+25
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-22/+25
| | |\
| | | * Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-141-2/+9
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-141-2/+9
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-141-2/+9
| | | |\ \
| | | | * | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-141-2/+9
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-141-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix combining marks handling in Core Text shaperJiang Jiang2011-03-111-1/+2
| * | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1112-12/+12
| |\ \ \ \ \
| | * | | | | Update copyright year to 2011.Rohan McGovern2011-03-1012-12/+12
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-101-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Not requiring valid QTextBlock in previous()Jiang Jiang2011-03-101-1/+1
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-091-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-081-1/+1
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-041-2/+4
| | |\ \ \ | | | |/ /
| | | * | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
* | | | | don't print debug outputcon2011-03-041-1/+1
|/ / / /
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-011-2/+3
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-282-7/+13
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| | | * Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-281-2/+3
| | | |\
| | | | * Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-1/+3
| | | | * Fix out of bounds handling in Mac shaperJiang Jiang2011-01-141-2/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-014-0/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-284-0/+32
| |\ \ \ \
| | * | | | Resolve font alias before testing for exact matchingJiang Jiang2011-02-284-0/+32
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-283-32/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ammend INTEGRITY fixesHarald Fernengel2011-02-231-3/+4
| * | | | | Compile for systems without mmapRolland Dudemaine2011-02-221-10/+40
| * | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-222-22/+25
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-281-11/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Stop using XLFD as fontconfig matching fallbackJiang Jiang2011-02-241-11/+0
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-252-41/+99
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-232-41/+99
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-212-41/+99
| | * | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-4/+8
* | | | | Check engine existence before increasing reference countJiang Jiang2011-02-231-3/+6
* | | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-231-0/+15
|/ / / /
* | | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-092-17/+2
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-045-7/+69
|\ \ \ \ | |/ / /
| * | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-013-4/+30
| * | | Add support for line spacing in Text element.Yann Bodson2011-01-282-3/+19
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-274-27/+553
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1996-112/+112
| |\ \ \ | | | |/ | | |/|
generated by cgit v0.12 at 2024-10-27 03:16:14 (GMT)