Bounding rect of text was not always calculated correctly.

The boundingRect depended upon the image cache which may not become
valid until after boundingRect is called.

Task-number: QTBUG-12291
Reviewed-by: Michael Brasser
(cherry picked from commit 3aeafb4839f49f524f10eae65be27fd189d37060)

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 821394d..658f381 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -97,6 +97,8 @@ private slots:
 
     void clickLink();
 
+    void QTBUG_12291();
+
 private:
     QStringList standard;
     QStringList richText;
@@ -898,6 +900,23 @@ void tst_qdeclarativetext::wordSpacing()
     }
 }
 
+void tst_qdeclarativetext::QTBUG_12291()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/rotated.qml");
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QObject *ob = canvas->rootObject();
+    QVERIFY(ob != 0);
+
+    QDeclarativeText *text = ob->findChild<QDeclarativeText*>("text");
+    QVERIFY(text);
+    QVERIFY(text->boundingRect().isValid());
+}
+
 class EventSender : public QGraphicsItem
 {
 public: