Don't render when width is zero and elide is not None

Works now similarly as with very small text lengths (smaller than
elide characted length).

Change-Id: I0c4aafbcc50343bb0ec8b5f335045e1048a499fd
Task-number: QTBUG-34990
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

3 files changed, 45 insertions, 0 deletions

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index f3254cf8d7..8b1d47ac0b 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -650,6 +650,11 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
             emit q->lineCountChanged();
         }
 
+        if (qFuzzyIsNull(q->width())) {
+            layout.setText(QString());
+            textHasChanged = true;
+        }
+
         QFontMetricsF fm(font);
         qreal height = (lineHeightMode() == QQuickText::FixedHeight) ? lineHeight() : qCeil(fm.height()) * lineHeight();
         *baseline = fm.ascent();
diff --git a/tests/auto/quick/qquicktext/data/ellipsisText.qml b/tests/auto/quick/qquicktext/data/ellipsisText.qml
new file mode 100644
index 0000000000..37faafcbf3
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/ellipsisText.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Text {
+    width: 0
+    height: 10
+    text: "Meaningless text"
+    elide: Text.ElideRight
+
+    Text {
+        objectName: "elidedRef"
+        width: 10
+        height: 10
+        text: "Meaningless text"
+        elide: Text.ElideRight
+    }
+}
+
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 46ec099501..d0fc36936a 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -147,6 +147,9 @@ private slots:
 
     void padding();
 
+    void zeroWidthAndElidedDoesntRender();
+
+
 private:
     QStringList standard;
     QStringList richText;
@@ -4146,6 +4149,26 @@ void tst_qquicktext::padding()
     delete root;
 }
 
+void tst_qquicktext::zeroWidthAndElidedDoesntRender()
+{
+    // Tests QTBUG-34990
+
+    QQmlComponent component(&engine, testFile("ellipsisText.qml"));
+
+    QScopedPointer<QObject> object(component.create());
+
+    QQuickText *text = qobject_cast<QQuickText *>(object.data());
+    QVERIFY(text);
+
+    QCOMPARE(text->contentWidth(), 0.0);
+
+    QQuickText *reference = text->findChild<QQuickText *>("elidedRef");
+    QVERIFY(reference);
+
+    text->setWidth(10);
+    QCOMPARE(text->contentWidth(), reference->contentWidth());
+}
+
 QTEST_MAIN(tst_qquicktext)
 
 #include "tst_qquicktext.moc"