diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 8f0dd10940..105ace8d97 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -313,6 +313,8 @@ private slots: void shortcutOverrideOnReadonlyLineEdit(); void QTBUG59957_clearButtonLeftmostAction(); + void QTBUG_60319_setInputMaskCheckImSurroundingText(); + protected slots: void editingFinished(); @@ -4708,5 +4710,16 @@ bool tst_QLineEdit::unselectingWithLeftOrRightChangesCursorPosition() return false; } +void tst_QLineEdit::QTBUG_60319_setInputMaskCheckImSurroundingText() +{ + QLineEdit *testWidget = ensureTestWidget(); + QString mask("+000(000)-000-00-00"); + testWidget->setInputMask(mask); + testWidget->setCursorPosition(mask.length()); + QString surroundingText = testWidget->inputMethodQuery(Qt::ImSurroundingText).toString(); + int cursorPosition = testWidget->inputMethodQuery(Qt::ImCursorPosition).toInt(); + QCOMPARE(surroundingText.length(), cursorPosition); +} + QTEST_MAIN(tst_QLineEdit) #include "tst_qlineedit.moc" |