1 files changed, 19 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 95799905de..1c68a5f752 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -3530,6 +3530,13 @@ void tst_QLineEdit::textMargin()
     centerOnScreen(&tlw);
     tlw.show();
 
+    const QMargins margins = testWidget.textMargins();
+    QCOMPARE(left, margins.left());
+    QCOMPARE(top, margins.top());
+    QCOMPARE(right, margins.right());
+    QCOMPARE(bottom, margins.bottom());
+
+#if QT_DEPRECATED_SINCE(5, 14)
     int l;
     int t;
     int r;
@@ -3539,6 +3546,7 @@ void tst_QLineEdit::textMargin()
     QCOMPARE(top, t);
     QCOMPARE(right, r);
     QCOMPARE(bottom, b);
+#endif
 
     QTest::mouseClick(&testWidget, Qt::LeftButton, 0, mousePressPos);
     QTRY_COMPARE(testWidget.cursorPosition(), cursorPosition);
@@ -3615,6 +3623,14 @@ void tst_QLineEdit::task174640_editingFinished()
 
     le2->setFocus();
     QTRY_VERIFY(le2->hasFocus());
+    // editingFinished will not be emitted anew because no editing happened
+    QCOMPARE(editingFinishedSpy.count(), 0);
+
+    le1->setFocus();
+    QTRY_VERIFY(le1->hasFocus());
+    QTest::keyPress(le1, Qt::Key_Plus);
+    le2->setFocus();
+    QTRY_VERIFY(le2->hasFocus());
     QCOMPARE(editingFinishedSpy.count(), 1);
     editingFinishedSpy.clear();
 
@@ -3632,6 +3648,8 @@ void tst_QLineEdit::task174640_editingFinished()
     delete testMenu1;
     QCOMPARE(editingFinishedSpy.count(), 0);
     QTRY_VERIFY(le1->hasFocus());
+    // Ensure le1 has been edited
+    QTest::keyPress(le1, Qt::Key_Plus);
 
     QMenu *testMenu2 = new QMenu(le2);
     testMenu2->addAction("foo2");
@@ -3986,7 +4004,7 @@ void tst_QLineEdit::QTBUG7174_inputMaskCursorBlink()
     edit.setFocus();
     edit.setText(QLatin1String("AAAA"));
     edit.show();
-    QRect cursorRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QRect cursorRect = edit.inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QVERIFY(QTest::qWaitForWindowExposed(&edit));
     edit.updateRegion = QRegion();
     QTest::qWait(QApplication::cursorFlashTime());