summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocumentlayout.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into origin/4.8Olivier Goffart2011-05-031-2/+11
|\
| * Support more items for QTextCharFormat::VerticalAlignment enum for custom tex...Dmitry Zelenkovsky2011-04-281-2/+11
* | Fixes warnings about unused variablesOlivier Goffart2011-04-281-0/+1
|/
* Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-2/+0
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-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-211-1/+1
| |\
| | * Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
| * | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-091-3/+5
* | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-091-13/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-1/+14
|\ \ \ | |/ /
| * | Add support for line spacing in Text element.Yann Bodson2011-01-281-2/+15
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-2/+2
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| * Doc: Fixing typoSergio Ahumada2011-01-071-1/+1
* | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1
* | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeightEskil Abrahamsen Blomfeldt2011-01-041-1/+1
* | Add line spacing to QTextBlockFormat, get/set functions, CSS supportJoshua Grauman2011-01-041-6/+32
|/
* Use the textDirection() of blocks correctly.Lars Knoll2010-06-091-6/+2
* Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
* Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* CompileEskil Abrahamsen Blomfeldt2009-11-101-1/+1
* Pixelalign circles in HTML bullet listsGunnar Sletta2009-11-091-1/+1
* Fixed inconsistent coloring of bullets, circles and square listsGunnar Sletta2009-11-091-1/+1
* Line spacing fixesJoerg Bornemann2009-10-231-1/+4
* 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
* | Don't float objects into next page unless they can fit in itEskil Abrahamsen Blomfeldt2009-08-241-1/+13
* | Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
* | QVariant: added toFloat and toRealThierry Bastian2009-08-141-2/+2
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman for...Nils Jeisecke2009-07-131-1/+5
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-18/+18
|\ \ | |/
| * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+3224
* refactor of private getters for the mode i item widget classesThierry Bastian2009-06-111-6/+4
* improved string operations all over the placeThierry Bastian2009-05-281-1/+1
* Long live Qt!Lars Knoll2009-03-231-0/+3224