1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 768062314b..f5637e47f1 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -217,6 +217,7 @@ private slots:
     void doubleSelect_QTBUG_38704();
 
     void padding();
+    void paddingAndWrap();
     void QTBUG_51115_readOnlyResetsSelection();
     void keys_shortcutoverride();
 
@@ -5770,6 +5771,30 @@ void tst_qquicktextedit::padding()
     delete root;
 }
 
+void tst_qquicktextedit::paddingAndWrap()
+{
+    // Check that the document ends up with the correct width if
+    // we set left and right padding after component completed.
+    QScopedPointer<QQuickView> window(new QQuickView);
+    window->setSource(testFileUrl("wordwrap.qml"));
+    QTRY_COMPARE(window->status(), QQuickView::Ready);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+    QQuickItem *root = window->rootObject();
+    QVERIFY(root);
+    QQuickTextEdit *obj = qobject_cast<QQuickTextEdit *>(root);
+    QVERIFY(obj != nullptr);
+    QTextDocument *doc = QQuickTextEditPrivate::get(obj)->document;
+
+    QCOMPARE(doc->textWidth(), obj->width());
+    obj->setLeftPadding(10);
+    obj->setRightPadding(10);
+    QCOMPARE(doc->textWidth(), obj->width() - obj->leftPadding() - obj->rightPadding());
+    obj->setLeftPadding(0);
+    obj->setRightPadding(0);
+    QCOMPARE(doc->textWidth(), obj->width());
+}
+
 void tst_qquicktextedit::QTBUG_51115_readOnlyResetsSelection()
 {
     QQuickView view;