Call polish after setting HAlign in Qml TextEdit

Qml TextEdit does not call polish() in the setter for horizontal alignment.

The test that tests horizontal alignment for TextEdit is broken,
creating a Text item instead of a TextEdit and therefore calling the
wrong setter.

This test also has a false positive as a result of an unnecessary
subtraction.

Fixes: QTBUG-56921
Pick-to: 6.5 6.2 5.15
Change-Id: I21df3c4f403980fb5512abfd5e7e32a064cd60d7
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit e7d0395b47a110a4f35518b18b479535a1cf9ed1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 27 insertions, 26 deletions

diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index d7e189cf96..dd0e800574 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -862,6 +862,7 @@ void QQuickTextEdit::setHAlign(HAlignment align)
     if (d->setHAlign(align, true) && isComponentComplete()) {
         d->updateDefaultTextOption();
         updateSize();
+        updateWholeDocument();
     }
 }
 
diff --git a/tests/auto/quick/qquicktextedit/data/hAlignVisual.qml b/tests/auto/quick/qquicktextedit/data/hAlignVisual.qml
index 1280a655f0..f532a9aa36 100644
--- a/tests/auto/quick/qquicktextedit/data/hAlignVisual.qml
+++ b/tests/auto/quick/qquicktextedit/data/hAlignVisual.qml
@@ -4,11 +4,11 @@ Rectangle {
     width: 200
     height: 100
 
-    Text {
-        objectName: "textItem"
+    TextEdit {
+        objectName: "textEditItem"
         text: "AA\nBBBBBBB\nCCCCCCCCCCCCCCCC"
         anchors.centerIn: parent
-        horizontalAlignment: Text.AlignLeft
+        horizontalAlignment: TextEdit.AlignLeft
         font.pointSize: 12
         font.family: "Times New Roman"
     }
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 6442c49212..13b5a4c532 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -986,8 +986,8 @@ void tst_qquicktextedit::hAlignVisual()
     view.showNormal();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-    QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
-    QVERIFY(text != nullptr);
+    QQuickTextEdit *text = view.rootObject()->findChild<QQuickTextEdit*>("textEditItem");
+    QVERIFY(text);
 
     // Try to check whether alignment works by checking the number of black
     // pixels in the thirds of the grabbed image.
@@ -1014,7 +1014,7 @@ void tst_qquicktextedit::hAlignVisual()
     }
     {
         // HCenter Align
-        text->setHAlign(QQuickText::AlignHCenter);
+        text->setHAlign(QQuickTextEdit::AlignHCenter);
         QImage image = view.grabWindow();
         const int left = numberOfNonWhitePixels(centeredSection1, centeredSection2, image);
         const int mid = numberOfNonWhitePixels(centeredSection2, centeredSection3, image);
@@ -1024,7 +1024,7 @@ void tst_qquicktextedit::hAlignVisual()
     }
     {
         // Right Align
-        text->setHAlign(QQuickText::AlignRight);
+        text->setHAlign(QQuickTextEdit::AlignRight);
         QImage image = view.grabWindow();
         const int left = numberOfNonWhitePixels(centeredSection1, centeredSection2, image);
         const int mid = numberOfNonWhitePixels(centeredSection2, centeredSection3, image);
@@ -1036,36 +1036,36 @@ void tst_qquicktextedit::hAlignVisual()
     text->setWidth(200);
 
     {
-        // Left Align
+        // Right Align
         QImage image = view.grabWindow();
-        int x = qCeil(text->implicitWidth() * view.devicePixelRatio());
-        int left = numberOfNonWhitePixels(0, x, image);
-        int right = numberOfNonWhitePixels(x, image.width() - x, image);
-        QVERIFY2(left > 0, msgNotGreaterThan(left, 0).constData());
-        QCOMPARE(right, 0);
+        const int x = image.width() - qCeil(text->implicitWidth() * view.devicePixelRatio());
+        const int left = numberOfNonWhitePixels(0, x, image);
+        const int right = numberOfNonWhitePixels(x, image.width() - x, image);
+        QCOMPARE(left, 0);
+        QVERIFY2(right > 0, msgNotGreaterThan(left, 0).constData());
     }
     {
         // HCenter Align
-        text->setHAlign(QQuickText::AlignHCenter);
+        text->setHAlign(QQuickTextEdit::AlignHCenter);
         QImage image = view.grabWindow();
-        int x1 = qFloor(image.width() - text->implicitWidth() * view.devicePixelRatio()) / 2;
-        int x2 = image.width() - x1;
-        int left = numberOfNonWhitePixels(0, x1, image);
-        int mid = numberOfNonWhitePixels(x1, x2 - x1, image);
-        int right = numberOfNonWhitePixels(x2, image.width() - x2, image);
+        const int x1 = qFloor(image.width() - text->implicitWidth() * view.devicePixelRatio()) / 2;
+        const int x2 = image.width() - x1;
+        const int left = numberOfNonWhitePixels(0, x1, image);
+        const int mid = numberOfNonWhitePixels(x1, x2 - x1, image);
+        const int right = numberOfNonWhitePixels(x2, image.width(), image);
         QCOMPARE(left, 0);
         QVERIFY2(mid > 0, msgNotGreaterThan(left, 0).constData());
         QCOMPARE(right, 0);
     }
     {
-        // Right Align
-        text->setHAlign(QQuickText::AlignRight);
+        // Left Align
+        text->setHAlign(QQuickTextEdit::AlignLeft);
         QImage image = view.grabWindow();
-        int x = image.width() - qCeil(text->implicitWidth() * view.devicePixelRatio());
-        int left = numberOfNonWhitePixels(0, x, image);
-        int right = numberOfNonWhitePixels(x, image.width() - x, image);
-        QCOMPARE(left, 0);
-        QVERIFY2(right > 0, msgNotGreaterThan(left, 0).constData());
+        const int x = qCeil(text->implicitWidth() * view.devicePixelRatio());
+        const int left = numberOfNonWhitePixels(0, x, image);
+        const int right = numberOfNonWhitePixels(x, image.width() - x, image);
+        QVERIFY2(left > 0, msgNotGreaterThan(left, 0).constData());
+        QCOMPARE(right, 0);
     }
 }