Merge remote-tracking branch 'mainline/4.7' into 4.7

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 581b58c..ca6e87a 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -658,6 +658,24 @@ void tst_qdeclarativetext::verticalAlignment()
         }
     }
 
+    //confirm that bounding rect is correctly positioned.
+    QString componentStr = "import QtQuick 1.0\nText { height: 80; text: \"Hello\" }";
+    QDeclarativeComponent textComponent(&engine);
+    textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+    QVERIFY(textObject != 0);
+    QRectF br = textObject->boundingRect();
+    QVERIFY(br.y() == 0);
+
+    textObject->setVAlign(QDeclarativeText::AlignVCenter);
+    br = textObject->boundingRect();
+    QCOMPARE(qFloor(br.y()), qFloor((80.0 - br.height())/2));
+
+    textObject->setVAlign(QDeclarativeText::AlignBottom);
+    br = textObject->boundingRect();
+    QCOMPARE(qFloor(br.y()), qFloor(80.0 - br.height()));
+
+    delete textObject;
 }
 
 void tst_qdeclarativetext::font()