1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index c854f86..9c12a90 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -1156,12 +1156,14 @@ void tst_qdeclarativetext::lineHeight()
     QVERIFY(myText->lineHeightMode() == QDeclarativeText::ProportionalHeight);
 
     qreal h = myText->height();
+    int lc = myText->lineCount();
+    qreal lh = myText->height() / lc;
     myText->setLineHeight(1.5);
-    QVERIFY(myText->height() == h * 1.5);
+    QVERIFY(qAbs(myText->height() - (((lc-1) * lh * 1.5) + lh)) < 1.0);
 
     myText->setLineHeightMode(QDeclarativeText::FixedHeight);
     myText->setLineHeight(20);
-    QCOMPARE(myText->height(), myText->lineCount() * 20.0);
+    QCOMPARE(myText->height(), ((lc-1) * 20.0) + lh);
 
     myText->setText("Lorem ipsum sit <b>amet</b>, consectetur adipiscing elit. Integer felis nisl, varius in pretium nec, venenatis non erat. Proin lobortis interdum dictum.");
     myText->setLineHeightMode(QDeclarativeText::ProportionalHeight);