summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-256-11/+60
|\
| * Recommit 1ebeb971d3382aec0fff927Eskil Abrahamsen Blomfeldt2010-03-226-11/+60
* | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-231-3/+2
* | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-232-0/+15
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-41/+82
|\ \ | |/
| * Revert "Optimize getting bearings of a glyph on Windows for true type fonts"Olivier Goffart2010-03-196-59/+11
| * Optimize getting bearings of a glyph on Windows for true type fontsEskil Abrahamsen Blomfeldt2010-03-176-11/+59
| * Optimize speed of QTextLayout and QPainter::drawTextEskil Abrahamsen Blomfeldt2010-03-171-40/+82
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-173-5/+5
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-173-5/+5
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-1/+2
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-154-7/+18
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-117-58/+138
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-014-9/+12
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-238-7/+913
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-6/+13
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-167-31/+81
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-4/+9
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1210-39/+87
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2193-158/+154
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-1826-239/+324
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-0624-181/+321
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Various header file inclusion fixes for rvct on linux using a case-sensitive ...Simon Hausmann2009-10-234-7/+7
* | | | | | | | | | | | | | | 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 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