summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextobject.cpp
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-11/+6
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-171-6/+1
| |\
| | * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-061-6/+1
| | |\
| | | * Revert symbol addition in b033bb9Jiang Jiang2011-04-291-6/+1
| * | | Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-101-5/+5
| |/ /
* | | 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-0/+5
|\ \ \ | |/ / |/| / | |/
| * Make sure removed QTextBlock is invalidJiang Jiang2011-04-111-0/+5
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+1
|\ \ | |/
| * Not requiring valid QTextBlock in previous()Jiang Jiang2011-03-101-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-3/+3
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-101-1/+1
| |\
| | * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| * | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-2/+3
|\ \ | |/
| * Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-311-2/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-0/+4
|\ \ | |/
| * respect the layout direction in the default text optionLars Knoll2010-08-181-0/+4
* | Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-021-0/+29
|/
* doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-201-1/+1
* Add QTextBlock::textDirection()Lars Knoll2010-06-091-0/+43
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-281-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
| * Make assorted constructors follow good coding practiceKeith Isdale2009-08-241-10/+0
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-8/+8
* | More coverity warnings removedThierry Bastian2009-08-171-10/+0
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
|/
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* Doc: Added links to Text Object Example in QTextDocument and QTextObjectGeir Vattekar2009-05-061-1/+1
* Fix crash when accessing newly constructed QTextObjects.Benjamin Poulain2009-03-261-4/+4
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+1711