summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextobject.h
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-3/+3
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-171-1/+1
| |\
| | * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-061-1/+1
| | |\
| | | * Revert symbol addition in b033bb9Jiang Jiang2011-04-291-1/+1
| * | | Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| |/ /
* | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-191-0/+2
|\ \
| * | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-191-0/+2
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-121-1/+1
|\ \ \ | |/ / |/| / | |/
| * Make sure removed QTextBlock is invalidJiang Jiang2011-04-111-1/+1
* | 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
* | Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-021-0/+3
|/
* Add QTextBlock::textDirection()Lars Knoll2010-06-091-0/+2
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Update tech preview license header.Jason McDonald2009-08-311-13/+13
* Update license headers.Jason McDonald2009-08-111-1/+1
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+328