summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4....Qt Continuous Integration System2010-03-093-18/+74
|\
| * doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+4
| * FreeType: Fast lookup of Latin-1 glyphsAndreas Kling2010-03-052-16/+70
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-092-40/+61
|\ \ | |/
| * Avoid QString reallocation for smallcaps fonts in Itemizer::generate()Andreas Kling2010-03-041-1/+1
| * Avoid QString reallocation in QTextEngine::itemize()Andreas Kling2010-03-031-3/+1
| * Fixed a regression in the syntax highlighterThorbjørn Lindeijer2010-03-021-0/+3
| * minor optimization: don't mark contents as dirty if nothing was changedRitt Konstantin2010-03-021-3/+9
| * minor optimization: ignore invalid preeditAreaPosition/preeditAreaTextRitt Konstantin2010-03-021-17/+23
| * remove unused codeRitt Konstantin2010-03-021-1/+0
| * minor clean-ups and styling fixesRitt Konstantin2010-03-021-16/+12
| * don't even try to rehighlight invalid or alien blockRitt Konstantin2010-03-021-1/+1
| * don't cancel the scheduled complete rehighlight from rehighlightBlock()Ritt Konstantin2010-03-021-0/+5
| * replace temporary disconnection with a very simple statemachineRitt Konstantin2010-03-021-6/+14
* | Fix alignment of text with negative right bearingEskil Abrahamsen Blomfeldt2010-03-092-0/+3
|/
* Avoid always detaching QStaticTextEskil Abrahamsen Blomfeldt2010-02-241-2/+0
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-231-2/+2
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233-7/+11
| |\
| * | Fix compilation with namespace.ck2010-02-221-2/+2
* | | Add private qt_draw_glyphs() APIEskil Abrahamsen Blomfeldt2010-02-231-0/+1
| |/ |/|
* | Imporve win64 support for mingwThierry Bastian2010-02-221-3/+3
* | Fix assert in fontengine when using rotated/scaled QStaticTextGunnar Sletta2010-02-221-3/+7
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-226-19/+64
|\ \ | |/
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-207-5/+901
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-192-1/+26
| | |\
| | | * Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-191-6/+13
| | |\ \
| | | * \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-181-6/+13
| | | |\ \ | | | | |/
| | * | | Fix fallback for QStaticText when it's unsupported in paint engineEskil Abrahamsen Blomfeldt2010-02-192-7/+10
| | |/ /
| | * | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-181-3/+3
| * | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-6/+13
| |\ \ \ | | | |/ | | |/|
| | * | doc: Fixed some qdoc errors.Martin Smith2010-02-161-6/+13
| * | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-2/+12
| |\ \ \ | | |/ / | |/| |
| | * | Fix Thai text on Windows 7Eskil Abrahamsen Blomfeldt2010-02-161-2/+12
* | | | Copy useBackendOptimization setting when QStaticText is detachedEskil Abrahamsen Blomfeldt2010-02-221-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-162-34/+50
|\ \ \
| * | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-162-22/+34
| * | | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-161-12/+16
* | | | Fix license headers.Jason McDonald2010-02-163-54/+54
|/ / /
* | | Compile fix for QStaticText - include declaration of QColorRhys Weatherley2010-02-151-0/+1
* | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-155-9/+16
|\ \ \ | |/ /
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-136-30/+76
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-122-5/+7
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-112-5/+7
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-102-5/+7
| | | | |\ \
| | | | | * | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-051-2/+2
| | | | | |\ \
| | | | | | * \ Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-2/+2
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-022-3/+5
| | | | | | | |\ \
| | | | | | | * | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacingWarwick Allison2010-01-141-1/+9