Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Check engine existence before increasing reference count | Jiang Jiang | 2011-02-23 | 1 | -3/+6 | |
* | | | | | Keep reference count for cached font engines in QTextEngine | Jiang Jiang | 2011-02-23 | 1 | -0/+15 | |
|/ / / / | ||||||
* | | | | Revert part of commit 7c1ab9b6a8 | Olivier Goffart | 2011-02-09 | 2 | -17/+2 | |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 5 | -7/+69 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add a mouseSelectionMode property to TextEdit and TextInput. | Andrew den Exter | 2011-02-01 | 3 | -4/+30 | |
| * | | | Add support for line spacing in Text element. | Yann Bodson | 2011-01-28 | 2 | -3/+19 | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Bea Lam | 2011-01-27 | 4 | -27/+553 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 96 | -112/+112 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Disable dragging text in TextEdit. | Andrew den Exter | 2011-01-11 | 3 | -1/+21 | |
* | | | | Merge branch 'integration' | Yoann Lopes | 2011-02-02 | 3 | -3/+19 | |
|\ \ \ \ | ||||||
| * | | | | Fixes lastResortFamily() on Symbian when using FreeType. | Yoann Lopes | 2011-01-31 | 1 | -2/+16 | |
| * | | | | Fixes compilation when using FreeType on Symbian. | Yoann Lopes | 2011-01-31 | 2 | -1/+3 | |
* | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2011-01-27 | 4 | -7/+12 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into lighthouse-master | Jørgen Lind | 2011-01-26 | 96 | -120/+286 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| * | | | | | Add styleHint to fallback api for fontdatabases in Lighthouse | Jørgen Lind | 2011-01-04 | 4 | -7/+12 | |
* | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-01-26 | 2 | -3/+5 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-01-25 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Temporary fix for ambiguous cast from four letter char constant | Eckhart Koppen | 2011-01-25 | 1 | -2/+2 | |
| * | | | | | | Fix cursor position adjustment when removing strings | Jiang Jiang | 2011-01-25 | 1 | -1/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 3 | -26/+550 | |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | ||||||
| * | | | | Avoid possible font name collisions on fbserv | Alessandro Portale | 2011-01-24 | 3 | -23/+343 | |
| * | | | | Do not load aplication fonts on Symbian^1 and below | Alessandro Portale | 2011-01-19 | 1 | -0/+3 | |
| * | | | | Supporting Qt application fonts on Symbian | Alessandro Portale | 2011-01-19 | 2 | -22/+223 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 96 | -112/+112 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-01-10 | 96 | -97/+97 | |
| |\ \ \ | ||||||
| | * | | | QFont/Windows: restrict the pixel size accuracy | Joerg Bornemann | 2011-01-10 | 1 | -1/+1 | |
| | * | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 96 | -96/+96 | |
| * | | | | Merge branch 'graphics-team-text-4.7' into 4.7 | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 1 | -2/+2 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Fix crash in QTextBlock::next()/previous() | Jiang Jiang | 2011-01-07 | 1 | -2/+2 | |
| | | |/ | | |/| | ||||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-01-07 | 6 | -6/+6 | |
| |\ \ \ | ||||||
| | * | | | Doc: Fixing typo | Sergio Ahumada | 2011-01-07 | 6 | -6/+6 | |
| | |/ / | ||||||
| * | | | improve performance of QTextEngine, esp. setBoundary by using non-detaching o... | Milian Wolff | 2010-12-23 | 1 | -7/+7 | |
| |/ / | ||||||
* | | | Doc: Fixing typo | Sergio Ahumada | 2011-01-12 | 1 | -1/+1 | |
* | | | Compile when qreal != double | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 1 | -1/+1 | |
* | | | Make application font family names locale sensitive in X11 | Jiang Jiang | 2011-01-06 | 2 | -2/+24 | |
* | | | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight | Eskil Abrahamsen Blomfeldt | 2011-01-04 | 4 | -15/+11 | |
* | | | Add line spacing to QTextBlockFormat, get/set functions, CSS support | Joshua Grauman | 2011-01-04 | 6 | -6/+154 | |
| |/ |/| | ||||||
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-12-14 | 4 | -150/+186 | |
|\ \ | ||||||
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-13 | 4 | -150/+186 | |
| |\ \ | | |/ | ||||||
| | * | Runtime dependency on Symbians Font Table API | Alessandro Portale | 2010-12-09 | 3 | -147/+181 | |
| | * | Fix crash in QTextDocument::markContentsDirty | Jiang Jiang | 2010-12-06 | 1 | -2/+4 | |
* | | | Make sure num_glyphs pass to HarfBuzz is large enough | Jiang Jiang | 2010-12-13 | 1 | -1/+4 | |
|/ / | ||||||
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-12-09 | 2 | -1/+12 | |
|\ \ | ||||||
| * \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-07 | 1 | -0/+3 | |
| |\ \ | | |/ | ||||||
| | * | Fix QTextEdit::selectAll crash from textChanged() | Jiang Jiang | 2010-12-06 | 1 | -0/+3 | |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 1 | -1/+9 | |
| |\ \ | | |/ | ||||||
| | * | Fix strict-aliasing violation warning. | Thiago Macieira | 2010-11-26 | 1 | -1/+9 | |
| | * | Doc: Fixing typo | Sergio Ahumada | 2010-11-22 | 1 | -1/+1 | |
* | | | Fix boundingBox for raster engine with synthesized italic fonts | Jiang Jiang | 2010-12-09 | 1 | -5/+8 | |
|/ / | ||||||
* | | Restore patch that got lost in merge | Jørgen Lind | 2010-12-02 | 2 | -3/+66 | |