summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-092-17/+2
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-045-7/+69
|\
| * Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-013-4/+30
| * Add support for line spacing in Text element.Yann Bodson2011-01-282-3/+19
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-274-27/+553
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1996-112/+112
| |\ \
| * | | Disable dragging text in TextEdit.Andrew den Exter2011-01-113-1/+21
* | | | Merge branch 'integration'Yoann Lopes2011-02-023-3/+19
|\ \ \ \
| * | | | Fixes lastResortFamily() on Symbian when using FreeType.Yoann Lopes2011-01-311-2/+16
| * | | | Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-312-1/+3
* | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-274-7/+12
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2696-120/+286
| |\ \ \ \ \ | | |/ / / /
| * | | | | Add styleHint to fallback api for fontdatabases in LighthouseJørgen Lind2011-01-044-7/+12
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-262-3/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-251-2/+2
| |\ \ \ \ \
| | * | | | | Temporary fix for ambiguous cast from four letter char constantEckhart Koppen2011-01-251-2/+2
| * | | | | | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-1/+3
| |/ / / / /
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-253-26/+550
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Avoid possible font name collisions on fbservAlessandro Portale2011-01-243-23/+343
| * | | | Do not load aplication fonts on Symbian^1 and belowAlessandro Portale2011-01-191-0/+3
| * | | | Supporting Qt application fonts on SymbianAlessandro Portale2011-01-192-22/+223
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1796-112/+112
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1096-97/+97
| |\ \ \
| | * | | QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
| | * | | Update copyright year to 2011.Jason McDonald2011-01-1096-96/+96
| * | | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-101-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-076-6/+6
| |\ \ \
| | * | | Doc: Fixing typoSergio Ahumada2011-01-076-6/+6
| | |/ /
| * | | improve performance of QTextEngine, esp. setBoundary by using non-detaching o...Milian Wolff2010-12-231-7/+7
| |/ /
* | | Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
* | | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1
* | | Make application font family names locale sensitive in X11Jiang Jiang2011-01-062-2/+24
* | | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeightEskil Abrahamsen Blomfeldt2011-01-044-15/+11
* | | Add line spacing to QTextBlockFormat, get/set functions, CSS supportJoshua Grauman2011-01-046-6/+154
| |/ |/|
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-144-150/+186
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-134-150/+186
| |\ \ | | |/
| | * Runtime dependency on Symbians Font Table APIAlessandro Portale2010-12-093-147/+181
| | * Fix crash in QTextDocument::markContentsDirtyJiang Jiang2010-12-061-2/+4
* | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2010-12-131-1/+4
|/ /
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-092-1/+12
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-071-0/+3
| |\ \ | | |/
| | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-1/+9
| |\ \ | | |/
| | * Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | * Doc: Fixing typoSergio Ahumada2010-11-221-1/+1
* | | Fix boundingBox for raster engine with synthesized italic fontsJiang Jiang2010-12-091-5/+8
|/ /
* | Restore patch that got lost in mergeJørgen Lind2010-12-022-3/+66
* | Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-1/+1
|\ \