summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-071-1/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-071-1/+3
| |\
| | * Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
* | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-311-5/+5
|\ \ \ | |/ /
| * | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-301-5/+5
| |/
* | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-6/+15
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-241-5/+5
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-231-1/+10
| |\ \
| | * | Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-08-231-1/+10
| | |/
| * | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-301-5/+5
| |/
* | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-07-011-5/+5
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-6/+2
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-6/+2
| |\
| | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-6/+2
| * | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| |/
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-041-1/+0
|\ \ | |/ |/|
| * Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-161-13/+160
| |\
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-011-21/+17
| |\ \
| * | | Fixed QML TextEdit docsThiago Marcos P. Santos2011-02-251-1/+0
* | | | Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-9/+6
| |_|/ |/| |
* | | Update QML "What's New" docs.Martin Jones2011-03-111-1/+1
* | | Add missing header include missing from the previous commitJoona Petrell2011-03-091-0/+1
* | | Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-4/+3
* | | Base empty QML editor horizontal alignment on QApplication::keyboardInputDire...Joona Petrell2011-03-081-1/+2
* | | Merge branch '4.7' into qtquick11Joona Petrell2011-03-081-0/+1
|\ \ \
| * | | Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-071-0/+1
* | | | Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-26/+72
* | | | Removal of text alignment layout direction dependency was missing couple of c...Joona Petrell2011-03-041-3/+0
* | | | Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-041-4/+1
* | | | Add a way to query the reading direction of QML editor textJoona Petrell2011-03-031-0/+17
* | | | Merge branch '4.7' into qtquick11Martin Jones2011-03-011-28/+66
|\ \ \ \ | |/ / /
| * | | Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-011-0/+16
| * | | Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-011-0/+24
| * | | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-3/+3
| | |/ | |/|
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-4/+6
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-0/+1
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-4/+6
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-10/+27
| | | |\ \
| | | * | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-4/+6
| * | | | | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-211-1/+1
| * | | | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-211-20/+16
| | |_|_|/ | |/| | |
* | | | | Make sure horizontal QML editor text aligment always returns the actual align...Joona Petrell2011-03-011-2/+50
|/ / / /
* | | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-101-0/+1
|/ / /
* | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-031-0/+1
* | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-011-31/+53
* | | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-8/+35
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-11/+28
|\ \ \ | | |/ | |/|
| * | TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6