summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-10/+6
|\
| * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-271-10/+6
* | Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-193-18/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-131-0/+3
|\ \ | |/
| * Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-0/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-113-1/+11
|\ \
| * | Make sure removed QTextBlock is invalidJiang Jiang2011-04-113-1/+11
* | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-313-3/+6
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-281-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix text selection with shift-click.Andrew den Exter2011-03-281-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-251-1/+4
| |\ \
| | * | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2011-03-241-1/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-211-1/+1
| |\ \ \ | | |/ /
| | * | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
* | | | Ensure the right font is used for rendering text on MacAndy Shaw2011-03-301-1/+3
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-22/+25
|\ \ \ | |/ /
| * | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-141-2/+9
|\ \ \ | | |/ | |/|
| * | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-141-2/+9
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-101-1/+1
|\ \ \ | | |/ | |/|
| * | Not requiring valid QTextBlock in previous()Jiang Jiang2011-03-101-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-091-1/+1
|\ \ \ | | |/ | |/|
| * | Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-081-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-041-2/+4
|\ \ \ | |/ /
| * | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-282-7/+13
|\ \ \ | |/ / |/| / | |/
| * Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| * Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-281-2/+3
| |\
| | * Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-1/+3
| | * Fix out of bounds handling in Mac shaperJiang Jiang2011-01-141-2/+3
* | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-212-41/+99
* | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-4/+8
* | | 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-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
| |/ /
| * | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1996-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
| |/