summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1810-20/+85
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-175-6/+59
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-155-6/+59
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-125-6/+59
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-115-6/+59
| | | | |\
| | | | | * Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+InsertThiago Macieira2010-03-102-4/+10
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-103-2/+49
| | | | | |\
| | | | | | * Add ability to read last mod.time for zip entry.Ritt Konstantin2010-03-102-0/+19
| | | | | | * Avoid asserting when index passed to QZipReader::entryInfoAt is out of bounda...Ritt Konstantin2010-03-101-1/+3
| | | | | | * Add isValid() method to QZipReader::FileInfo.Ritt Konstantin2010-03-102-1/+7
| | | | | | * Add `QIODevice* device() const` public method to QZip classes.Ritt Konstantin2010-03-103-0/+20
| * | | | | | Speed up various QFontMetrics functionsSimon Hausmann2010-03-161-7/+7
| |/ / / / /
| * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-122-2/+2
| | * | | | Memory leak!Gabriel de Dietrich2010-03-091-1/+2
| | * | | | Avoid QString reallocation in QTextEngineAndreas Kling2010-03-041-4/+2
| * | | | | Add support for QFont::NoAntialias on QWSPaul Olav Tvete2010-03-111-3/+4
| * | | | | Fix 1-bit to 8-bit conversion for bitmap fonts on QWSPaul Olav Tvete2010-03-111-2/+12
| | |/ / / | |/| | |
| * | | | Fixed problem displaying half width character as full widthDaisuke Kameda2010-03-111-1/+1
| | |/ / | |/| |
* | | | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-118-59/+139
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-107-58/+138
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | |/ /
| * | | Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2010-03-101-1/+1
| |/ /
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-0121-50/+1021
|\ \ \ | |/ /
| * | 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
| | | |\ \ \