summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-058-24/+40
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-055-17/+23
| |\ \ | | |/
| | * Moving QPdf::stripSpecialCharacter to fontengineJørgen Lind2010-09-305-17/+23
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-1/+17
| |\ \ | | |/
| | * Fix QFontMetrics::lineWidth() for fonts with defined point sizeAlessandro Portale2010-09-281-1/+7
| | * Implemeting, exporting and autotesting QFont::lastResortFont()Alessandro Portale2010-09-281-0/+10
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-6/+0
| |\ \ | | |/
| | * Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-303-3/+9
|\ \ \
| * | | Lighthouse: Make application fonts workJørgen Lind2010-09-303-3/+9
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2714-65/+77
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-222-2/+0
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-2/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | remove extra includesRitt Konstantin2010-09-212-2/+0
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-221-2/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
| | * | | Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-215-9/+26
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| | * | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-2/+2
| | |\ \
| | | * | Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText)Eskil Abrahamsen Blomfeldt2010-09-131-2/+2
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-102-2/+4
| | |\ \ \ | | | |/ /
| | | * | Fix cache_cost initialization of QFontEngineMultiWinJiang Jiang2010-09-101-0/+3
| | | * | Fix crash when using unprintable chars in QStaticTextEskil Abrahamsen Blomfeldt2010-09-101-2/+1
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-094-73/+90
| | |\ \ \ | | | |/ /
| | * | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-072-3/+7
| | |\ \ \
| | * \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-037-19/+51
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-022-3/+4
| | |\ \ \ \ \
| | | * | | | | Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-311-2/+3
| | | * | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
| * | | | | | | Fix crash in Mac font loadingJiang Jiang2010-09-142-8/+3
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-108-47/+45
| |\ \ \ \ \ \ \
| | * | | | | | | Fix Core Text font loading for certain Mac FontsJiang Jiang2010-09-103-29/+24
| | * | | | | | | Support sub pixel positioning of glyphs in raster engineEskil Abrahamsen Blomfeldt2010-09-097-18/+21
* | | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-1314-39/+1756
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1314-103/+165
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Initial pluggable fontdatabaseJørgen Lind2010-09-0214-41/+1758
| * | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-263-22/+29
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1327-187/+299
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1011-86/+139
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Pulled code form initializeDb() out into addFontToScreenDevice()Alessandro Portale2010-09-081-52/+53
| | * | | | | | Moved font list getter to qfontdatabase_s60.cpp. Reusable.Alessandro Portale2010-09-082-9/+19
| | * | | | | | Pulled some code from One long function into a short oneAlessandro Portale2010-09-081-5/+11
| | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-072-7/+7
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-032-7/+7
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-031-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Recognize @, #, $ and ` as word separatorsThorbjørn Lindeijer2010-09-031-0/+4
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-031-3/+3
| | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-021-8/+28
| | |\ \ \ \ \
generated by cgit v0.12 at 2024-11-22 23:01:15 (GMT)