summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontmetrics.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded charEskil Abrahamsen Blomfeldt2010-08-061-1/+31
|/
* Add the Qt::TextBypassShaping flag.Jocelyn Turcotte2010-05-311-0/+25
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-1/+1
|\
| * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-301-2/+2
|\ \
| * | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-251-2/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-8/+13
|\ \ \ | |/ / |/| / | |/
| * Recommit 1ebeb971d3382aec0fff927Eskil Abrahamsen Blomfeldt2010-03-221-8/+13
* | Speed up various QFontMetrics functionsSimon Hausmann2010-03-161-7/+7
|/
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-191-3/+19
* Always use QExplicitlySharedDataPointer<QFontPrivate>Andreas Kling2009-10-271-28/+21
* Small optimisation in QFontMetrics multi-length-stringOlivier Goffart2009-09-161-4/+6
* 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
* | Merge commit 'qt/master'Jason Barron2009-08-181-12/+9
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-4/+2
| * | Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-161-8/+7
* | | Merge commit 'qt/master'Jason Barron2009-08-131-6/+21
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| * | Change QFontMetrics::width to return the width of the longest variant if the ...Olivier Goffart2009-08-111-2/+4
| * | Make QFontMetrics::elidedText aware of multi-length stringsOlivier Goffart2009-08-111-2/+15
| * | Add the Qt::TextLongestVariant flag so QFontMetrics::size returns the size of...Olivier Goffart2009-08-111-1/+1
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-7/+5
|\ \ \ | |/ /
| * | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-1/+1
| * | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-6/+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-4/+4
|/
* Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-6/+6
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+1739