summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
Commit message (Expand)AuthorAgeFilesLines
* Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-07-081-0/+9
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-0/+3
|\
| * Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-291-3/+2
|\ \ | |/
| * Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
| * Clear QFontCache TLS content before nullifying TLS pointer.Janne Koskinen2010-04-081-1/+3
* | doc: Clarify effect of QFont::NoFontMergingEskil Abrahamsen Blomfeldt2010-04-131-3/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-04-081-0/+2
|\ \
| * | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-241-0/+2
* | | Clear QFontCache TLS content before nullifying TLS pointer.Janne Koskinen2010-04-081-1/+3
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-2/+3
|\ \ | |/
| * Clarify QFont::rawName() docs.Trond Kjernåsen2010-02-101-2/+3
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-211-4/+11
|\ \ | |/
| * Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ...Warwick Allison2010-01-141-1/+9
| * Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-121-1/+1
| |\
| | * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| * | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-111-2/+1
| |/
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-181-1/+3
|\ \ | |/
| * Small caps font variant wouldn't be used when defined through style sheetsGabriel de Dietrich2009-11-111-1/+3
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-061-7/+7
|\ \ | |/
| * Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-10-281-1/+1
| |\
| | * Line spacing fixesJoerg Bornemann2009-10-231-1/+1
| * | Always use QExplicitlySharedDataPointer<QFontPrivate>Andreas Kling2009-10-271-6/+6
| |/
* | Various header file inclusion fixes for rvct on linux using a case-sensitive ...Simon Hausmann2009-10-231-1/+1
|/
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Use QExplicitlySharedDataPointer wherever possibleHarald Fernengel2009-08-201-16/+8
* | Merge commit 'qt/master'Jason Barron2009-08-181-5/+4
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-5/+4
* | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| |/
* | Doc improvement made by David Boddie.Alessandro Portale2009-08-111-3/+3
* | Docs: Mentioning that Symbian has a default font size of 7 pointsAlessandro Portale2009-08-111-1/+3
* | Make S60 integration optional.Jason Barron2009-07-151-4/+4
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | Make Qt exception safer.Robert Griebl2009-06-101-31/+31
* | pointSize = 7 seems to be a good desfault for S60Alessandro Portale2009-06-081-1/+0
* | Optimize font DPI calculation by using cached value.Jason Barron2009-05-281-4/+2
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-251-0/+14
|\ \ | |/
| * qdoc: Added some missing qdoc comments.Martin Smith2009-05-251-0/+14
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-111-1/+1
|\ \ | |/
| * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+1
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-061-2/+8
|\ \ | |/
| * Fix a crash in case of setting invalid point sizeJarek Kobus2009-04-291-2/+8
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+3018
* Long live Qt for S60!axis2009-04-241-0/+3032