summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Change to commercial license headers in preparation for release.Jason McDonald2010-09-0796-1248/+1248
* Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-09-066-1/+34
* Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-061-3/+3
* Fix compiling issue for FreeType version earlier than 2.1.10Jiang Jiang2010-09-031-2/+9
* Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-09-011-1/+4
* Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-121-0/+2
* Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-121-4/+17
* Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-123-33/+87
* Fix RightBearing confusion in text layoutmae2010-08-121-1/+1
* Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-051-1/+6
* Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-041-3/+29
* doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-222-4/+2
* doc: Fixed several qdoc warnings.Martin Smith2010-07-161-3/+3
* Fix an Assert in QTextTablePierre Rossi2010-07-161-4/+24
* Revert "Fix an Assert in QTextTable"Aaron McCarthy2010-07-161-24/+4
* Fix an Assert in QTextTablePierre Rossi2010-07-161-4/+24
* Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-292-3/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-06-241-1/+1
|\
| * Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
* | Don't crash when cleaning the uninitialized fontdatabase (Symbian)Alessandro Portale2010-06-241-0/+2
|/
* Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
* Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-221-6/+15
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-214-26/+30
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-2122-73/+202
| |\
| | * Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-212-6/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-184-12/+15
| | |\
| | * \ Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte...David Boddie2010-06-181-20/+23
| | |\ \
| | | * | Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| * | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()Andy Shaw2010-06-211-0/+2
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-3/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-171-3/+11
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-4/+9
|\ \ \ \ \
| * | | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-161-4/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-163-3/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+11
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-123-3/+11
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| / | | | | | |_|/ | | | | |/| |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-083-3/+12
| | | | | |\ \
| | | | | | * | Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-082-2/+10
| | | | | | |\ \
| | | | | | | * | Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | * | Add convenience constructor to QTextOption::TabDavid Faure2010-06-042-2/+10
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix regression, remove artificial emboldening of monospaced fontsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-152-10/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |