summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextcontrol.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-10/+6
|\
| * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-271-10/+6
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+3
|\ \ | |/
| * Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-0/+3
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\ \ | |/
| * Fix text selection with shift-click.Andrew den Exter2011-03-281-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-141-2/+9
|\ \ | |/
| * Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-141-2/+9
* | Merge branch 4.7 into qt-master-from-4.7Qt 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 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-2/+4
|\ \ | |/
| * Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-38/+82
|\ \ | |/
| * Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-211-38/+82
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-3/+41
|\ \ | |/
| * Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-011-2/+25
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * | Disable dragging text in TextEdit.Andrew den Exter2011-01-111-1/+16
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | | |/ | |/|
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| |/
* | Update the text cursor's position for input method events.Pierre Rossi2010-11-101-0/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-6/+0
|\ \ | |/
| * Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-8/+0
|\ \ | |/
| * Ignore LayoutDirectionChange event in QTextControlJiang Jiang2010-08-191-8/+0
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
|/
* Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
* A small mistake when comparing the flag.Alexis Menard2010-04-281-1/+3
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-2/+4
|\
| * Fix crash with QTextEdit::textChanged() when deleting a characterEskil Abrahamsen Blomfeldt2010-04-121-2/+4
* | Remove the "Insert unicode control character" menu entry on X11.Pierre Rossi2010-03-311-2/+2
* | Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+InsertThiago Macieira2010-03-101-3/+8
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-111-3/+5
|\ \
| * | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| |/
* | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-101-2/+2
|/
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* Edit focus should not be lost unless by explicit actionSami Merila2009-12-211-1/+5
* Incorrect background while composing Japanese text(e.g 'shi' + <space>).Prasanth Ullattil2009-11-241-4/+2
* Softkeys: Text disappears from textbox when predictive text is active.Samuel Nevala2009-11-241-1/+2
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-131-11/+17
|\
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-061-10/+14
| |\
| | * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-051-1/+2
| | |\
| | * | Fix textControl so that it ignores mouse press events when neededThierry Bastian2009-11-051-10/+14
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-041-1/+2
| |\ \ \ | | | |/ | | |/|
| * | | QPlainTextEdit redraw issue in QTextControlmae2009-11-041-1/+3
| | |/ | |/|
* | | Add option to ingore unused navigation events in QTextControlEskil Abrahamsen Blomfeldt2009-11-111-7/+26
* | | Printing QTextDocument doesn't include custom objects.Samuel Rødal2009-11-111-0/+4
| |/ |/|
* | Fixed an input method bug when erasing the last character.axis2009-11-031-1/+2
|/
* Fix LIBRARY and ICONJørgen Lind2009-10-291-0/+2
* Make QTextControl give the right default action to Drag managerShane Kearns2009-10-121-2/+6