diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-10-12 13:02:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 01:47:58 +0200 |
| commit | 277ee9a676cb976b27a7b8667cac1ec0ba1e4ce0 (patch) | |
| tree | 8e6238229c0a40caba99011520265f45d9b379bd /tests | |
| parent | b97367494f9e3b753de907e8fbf3d668a00d5f44 (diff) | |
Fix TextInput echoMode test failure.
The default input method hints for a QSGItem is Qt::ImhMultiline and
TextInput is a single line input so clear that default flag in init.
Task-number: QTBUG-21686
Change-Id: I3b57227ee4182bf89f6789f775b56efb156df85b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp index 618915134c..9ab6e69ba1 100644 --- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp +++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp @@ -1925,7 +1925,6 @@ void tst_qsgtextinput::echoMode() //Normal ref &= ~Qt::ImhHiddenText; ref &= ~(Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText); - QEXPECT_FAIL("", "QTBUG-21686", Abort); QCOMPARE(input->inputMethodHints(), ref); input->setEchoMode(QSGTextInput::NoEcho); QCOMPARE(input->text(), initial); @@ -1964,9 +1963,10 @@ void tst_qsgtextinput::echoMode() QCOMPARE(input->displayText(), QLatin1String("Q")); QCOMPARE(input->inputMethodQuery(Qt::ImSurroundingText).toString(), QLatin1String("Q")); input->setFocus(true); + QVERIFY(input->hasActiveFocus()); QInputMethodEvent inputEvent; inputEvent.setCommitString(initial); - QGuiApplication::sendEvent(&canvas, &inputEvent); + QGuiApplication::sendEvent(input, &inputEvent); QCOMPARE(input->text(), initial); QCOMPARE(input->displayText(), initial); QCOMPARE(input->inputMethodQuery(Qt::ImSurroundingText).toString(), initial); |