Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I3878bbf2ac7b62651215938c98ead7171be49c74

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 1edf0401c6..c5c07fd28b 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -158,6 +158,7 @@ private slots:
 #endif
     void implicitSize_data();
     void implicitSize();
+    void implicitSize_QTBUG_63153();
     void contentSize();
     void boundingRect();
     void clipRect();
@@ -3392,6 +3393,18 @@ void tst_qquicktextedit::implicitSize()
     QCOMPARE(textObject->height(), textObject->implicitHeight());
 }
 
+void tst_qquicktextedit::implicitSize_QTBUG_63153()
+{
+    QString componentStr = "import QtQuick 2.0\nTextEdit { }";
+    QQmlComponent textComponent(&engine);
+    textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QQuickTextEdit *textObject = qobject_cast<QQuickTextEdit*>(textComponent.create());
+    textObject->setText("short");
+    qreal shortImplicitWidth = textObject->implicitWidth();
+    textObject->setText("in contrast to short this is long");
+    QVERIFY2(shortImplicitWidth < textObject->implicitWidth(), qPrintable(QString("%1 < %2").arg(textObject->implicitWidth()).arg(shortImplicitWidth)));
+}
+
 void tst_qquicktextedit::contentSize()
 {
     QString componentStr = "import QtQuick 2.0\nTextEdit { width: 75; height: 16; font.pixelSize: 10 }";