diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
| commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
| tree | 72c038e84d9fb1063c970a121949d898442c5648 /tests/auto/qlineedit | |
| parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| download | Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'tests/auto/qlineedit')
| -rw-r--r-- | tests/auto/qlineedit/tst_qlineedit.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 2c88561..6abbdcd 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -1770,13 +1770,6 @@ void tst_QLineEdit::passwordEchoDelay() QApplication::sendEvent(testWidget, &ev); QCOMPARE(testWidget->displayText(), QString(7, fillChar) + QLatin1Char('7')); - testWidget->setCursorPosition(3); - QCOMPARE(testWidget->displayText(), QString(7, fillChar) + QLatin1Char('7')); - QTest::keyPress(testWidget, 'a'); - QCOMPARE(testWidget->displayText(), QString(3, fillChar) + QLatin1Char('a') + QString(5, fillChar)); - QTest::keyPress(testWidget, Qt::Key_Backspace); - QCOMPARE(testWidget->displayText(), QString(8, fillChar)); - // restore clean state testWidget->setEchoMode(QLineEdit::Normal); } |