| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+9 |
|\ |
|
| * | Fix TextEdit mouseSelectionMode overriding selectByMouse. | Andrew den Exter | 2011-03-14 | 1 | -2/+9 |
|
|
* | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-09 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Update TextEdit's visible selection when only the anchor changes. | Andrew den Exter | 2011-03-08 | 1 | -1/+1 |
|
|
* | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-04 | 1 | -2/+4 |
|\ \
| |/ |
|
| * | Fix potential crash in QTextControl. | Lasse Holmstedt | 2011-03-04 | 1 | -2/+4 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -38/+82 |
|\ \
| |/ |
|
| * | Forward mouse events from TextInput and TextEdit to QInputContext. | Andrew den Exter | 2011-02-21 | 1 | -38/+82 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 1 | -3/+41 |
|\ \
| |/ |
|
| * | Add a mouseSelectionMode property to TextEdit and TextInput. | Andrew den Exter | 2011-02-01 | 1 | -2/+25 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 1 | -1/+1 |
| |\ |
|
| * | | Disable dragging text in TextEdit. | Andrew den Exter | 2011-01-11 | 1 | -1/+16 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
| |/ |
|
* | | Update the text cursor's position for input method events. | Pierre Rossi | 2010-11-10 | 1 | -0/+3 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 1 | -6/+0 |
|\ \
| |/ |
|
| * | Fix text direction setting in QTextBlock layout | Jiang Jiang | 2010-09-23 | 1 | -6/+0 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -8/+0 |
|\ \
| |/ |
|
| * | Ignore LayoutDirectionChange event in QTextControl | Jiang Jiang | 2010-08-19 | 1 | -8/+0 |
|
|
* | | Remove the use of deprecated qVariant* | Olivier Goffart | 2010-08-06 | 1 | -1/+1 |
|/ |
|
* | Make sure cursorPositionChanged is emitted when doing undo/redo | Thorbjørn Lindeijer | 2010-05-18 | 1 | -0/+8 |
|
|
* | A small mistake when comparing the flag. | Alexis Menard | 2010-04-28 | 1 | -1/+3 |
|
|
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-12 | 1 | -2/+4 |
|\ |
|
| * | Fix crash with QTextEdit::textChanged() when deleting a character | Eskil Abrahamsen Blomfeldt | 2010-04-12 | 1 | -2/+4 |
|
|
* | | Remove the "Insert unicode control character" menu entry on X11. | Pierre Rossi | 2010-03-31 | 1 | -2/+2 |
|
|
* | | Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert | Thiago Macieira | 2010-03-10 | 1 | -3/+8 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-11 | 1 | -3/+5 |
|\ \ |
|
| * | | A little optimization in QTextControlPrivate::setContent. | Alexis Menard | 2010-02-09 | 1 | -3/+5 |
| |/ |
|
* | | Crash when deleting the parent of a context menu while it is being displayed | Gabriel de Dietrich | 2010-02-10 | 1 | -2/+2 |
|/ |
|
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
|
|
* | Edit focus should not be lost unless by explicit action | Sami Merila | 2009-12-21 | 1 | -1/+5 |
|
|
* | Incorrect background while composing Japanese text(e.g 'shi' + <space>). | Prasanth Ullattil | 2009-11-24 | 1 | -4/+2 |
|
|
* | Softkeys: Text disappears from textbox when predictive text is active. | Samuel Nevala | 2009-11-24 | 1 | -1/+2 |
|
|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-13 | 1 | -11/+17 |
|\ |
|
| * | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-06 | 1 | -10/+14 |
| |\ |
|
| | * | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-11-05 | 1 | -1/+2 |
| | |\ |
|
| | * | | Fix textControl so that it ignores mouse press events when needed | Thierry Bastian | 2009-11-05 | 1 | -10/+14 |
|
|
| * | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-04 | 1 | -1/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | QPlainTextEdit redraw issue in QTextControl | mae | 2009-11-04 | 1 | -1/+3 |
| | |/
| |/| |
|
* | | | Add option to ingore unused navigation events in QTextControl | Eskil Abrahamsen Blomfeldt | 2009-11-11 | 1 | -7/+26 |
|
|
* | | | Printing QTextDocument doesn't include custom objects. | Samuel Rødal | 2009-11-11 | 1 | -0/+4 |
| |/
|/| |
|
* | | Fixed an input method bug when erasing the last character. | axis | 2009-11-03 | 1 | -1/+2 |
|/ |
|
* | Fix LIBRARY and ICON | Jørgen Lind | 2009-10-29 | 1 | -0/+2 |
|
|
* | Make QTextControl give the right default action to Drag manager | Shane Kearns | 2009-10-12 | 1 | -2/+6 |
|
|
* | Fix QKeySequence::DeleteEndOfWord and QKeySequence::DeleteStartOfWord | mae | 2009-10-05 | 1 | -2/+4 |
|
|
* | Making Keypad Navigation more usable | Alessandro Portale | 2009-09-19 | 1 | -1/+3 |
|
|
* | Update license headers again. | Jason McDonald | 2009-09-09 | 1 | -4/+4 |
|
|
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 1 | -13/+13 |
|\ |
|
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
|
|
| * | Update license headers. | Jason McDonald | 2009-08-11 | 1 | -1/+1 |
|
|