aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2011-07-26 10:10:50 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-26 06:29:54 +0200
commitf79b7b7c87ad69b9e07057a92c6628315b540a0e (patch)
tree80e9b116aaccf79a52dae963776342ce88977996 /tests
parent245b16b4fb50620aaf49683eb85a93807defea6a (diff)
Move the cursor position to the end when TextInput.readOnly is cleared.
Improves consistency with TextEdit. Task-number: QTBUG-18747 Change-Id: Ieb0a332441557fc6ba4c5ddaafea5c634aff1ee4 Reviewed-on: http://codereview.qt.nokia.com/2131 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp5
-rw-r--r--tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
index 409af727e7..3492ac2138 100644
--- a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
+++ b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
@@ -1785,6 +1785,11 @@ void tst_qsgtextedit::readOnly()
simulateKey(&canvas, Qt::Key_Space);
simulateKey(&canvas, Qt::Key_Escape);
QCOMPARE(edit->text(), initial);
+
+ edit->setCursorPosition(3);
+ edit->setReadOnly(false);
+ QCOMPARE(edit->isReadOnly(), false);
+ QCOMPARE(edit->cursorPosition(), edit->text().length());
}
void tst_qsgtextedit::simulateKey(QSGView *view, int key, Qt::KeyboardModifiers modifiers)
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
index c6c93c16e5..497c12f9e1 100644
--- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
+++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
@@ -1767,6 +1767,11 @@ void tst_qsgtextinput::readOnly()
simulateKey(&canvas, Qt::Key_Space);
simulateKey(&canvas, Qt::Key_Escape);
QCOMPARE(input->text(), initial);
+
+ input->setCursorPosition(3);
+ input->setReadOnly(false);
+ QCOMPARE(input->isReadOnly(), false);
+ QCOMPARE(input->cursorPosition(), input->text().length());
}
void tst_qsgtextinput::echoMode()