diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index 521d3086b57..5d539d7da43 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -1131,21 +1131,13 @@ bool QAndroidInputContext::focusObjectStopComposing()
 
     m_composingCursor = -1;
 
-    {
-        // commit the composing test
-        QList<QInputMethodEvent::Attribute> attributes;
-        QInputMethodEvent event(QString(), attributes);
-        event.setCommitString(m_composingText);
-        sendInputMethodEvent(&event);
-    }
-    {
-        // Moving Qt's cursor to where the preedit cursor used to be
-        QList<QInputMethodEvent::Attribute> attributes;
-        attributes.append(
-                QInputMethodEvent::Attribute(QInputMethodEvent::Selection, localCursorPos, 0));
-        QInputMethodEvent event(QString(), attributes);
-        sendInputMethodEvent(&event);
-    }
+    // commit composing text and cursor position
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes.append(
+        QInputMethodEvent::Attribute(QInputMethodEvent::Selection, localCursorPos, 0));
+    QInputMethodEvent event(QString(), attributes);
+    event.setCommitString(m_composingText);
+    sendInputMethodEvent(&event);
 
     return true;
 }
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index b348f9ffb69..a19c021d183 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -1590,14 +1590,44 @@ void tst_QLineEdit::textMask()
     QCOMPARE( testWidget->text(), insertString );
 }
 
+class LineEditChangingText : public QLineEdit
+{
+    Q_OBJECT
+
+public:
+    LineEditChangingText(QWidget *parent) : QLineEdit(parent)
+    {
+        connect(this, &QLineEdit::textEdited, this, &LineEditChangingText::onTextEdited);
+    }
+
+public slots:
+    void onTextEdited(const QString &text)
+    {
+        if (text.length() == 3)
+            setText(text + "-");
+    }
+};
+
 void tst_QLineEdit::setText()
 {
     QLineEdit *testWidget = ensureTestWidget();
-    QSignalSpy editedSpy(testWidget, SIGNAL(textEdited(QString)));
-    QSignalSpy changedSpy(testWidget, SIGNAL(textChanged(QString)));
-    testWidget->setText("hello");
-    QCOMPARE(editedSpy.size(), 0);
-    QCOMPARE(changedSpy.value(0).value(0).toString(), QString("hello"));
+    {
+        QSignalSpy editedSpy(testWidget, &QLineEdit::textEdited);
+        QSignalSpy changedSpy(testWidget, &QLineEdit::textChanged);
+        testWidget->setText("hello");
+        QCOMPARE(editedSpy.size(), 0);
+        QCOMPARE(changedSpy.value(0).value(0).toString(), QString("hello"));
+    }
+
+    QTestEventList keys;
+    keys.addKeyClick(Qt::Key_A);
+    keys.addKeyClick(Qt::Key_B);
+    keys.addKeyClick(Qt::Key_C);
+
+    LineEditChangingText lineEdit(nullptr);
+    keys.simulate(&lineEdit);
+    QCOMPARE(lineEdit.text(), "abc-");
+    QCOMPARE(lineEdit.cursorPosition(), 4);
 }
 
 void tst_QLineEdit::displayText_data()