summaryrefslogtreecommitdiff
path: root/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-241-6/+4
| | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Adapt to QInputPanel::inputDirection() APIPekka Vuorela2012-01-121-1/+1
| | | | | | | Information moved from QGuiApplication into QInputPanel. Change-Id: Idd80609f4b67bffae7222a1fa27918724ebf60f6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* TextEdits to include tentative commit in text propertyPekka Vuorela2011-12-141-2/+2
| | | | | | | | | | Similar to what qtbase 1dbfbf4c66187e7522888c19d78024cfceaea570 did for QTextEdit. Now available only in plain text, html support pending. Change-Id: I0b23a45fc484512d3354f66e1a6134e2d70eb8b5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove dead private method from TextEdit implementationsPekka Vuorela2011-12-091-17/+0
| | | | | Change-Id: I6c9a7c71607167b326dc45a35d97bcaf25a9d1b9 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Use QWidgetTextControl in the QtQuick1 TextEdit.Andrew den Exter2011-12-021-4/+7
| | | | | | | | | | | QDeclarative1TextEdit and QTextEdit have the same compatbility requirements so it makes sense they continue sharing the same line control implementation. This allows the QtQuick 2 TextInput to diverge without creating a third variation of QTextControl, Task-number: QTBUG-22627 Change-Id: Id4a8f6a17aeb756c3385cf8fca3de61b8c4be757 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-09-071-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | If there is no committed text in a TextInput or TextEdit determine if the pre-edit text is right to left before falling back to the global keyboard settings. Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48 Task-number: QMLNG-72 Reviewed-by: Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/4176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Fix TextInput and TextEdit software input panel on qtquick1Pekka Vuorela2011-09-081-4/+3
|/ | | | | | | Change-Id: I39da7a877cef546da69bccfcf7ee1ae2ba92b208 Reviewed-on: http://codereview.qt-project.org/4455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Bulk update of QtQuick 1 docs to \qmlmodule syntaxAlan Alpert2011-07-211-54/+55
| | | | | | | | Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c Reviewed-on: http://codereview.qt.nokia.com/1681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+1892
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
View Lorry Controller Status