From: Alan Alpert <aalpert@blackberry.com>
Date: Thu, 16 May 2013 21:32:05 +0000 (-0700)
Subject: Respond appropriately to textFormat changed
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4931f4078d7113bab73ca4ae1d9cedaa0e8712a6;p=konrad%2Fqtdeclarative.git

Respond appropriately to textFormat changed

If the text has not changed when textFormat changes between states other
than RichText, the text was not re-laid-out. This is necessary if the
text includes control tags.

Task-number: QTBUG-31191
Change-Id: I3c6f5343aa85e8337b90cf86748a696d5742e906
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
---

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 5fe0b52..cf9cb42 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1989,6 +1989,7 @@ void QQuickText::setTextFormat(TextFormat format)
             d->rightToLeftText = d->extra->doc->toPlainText().isRightToLeft();
         } else {
             d->rightToLeftText = d->text.isRightToLeft();
+            d->textHasChanged = true;
         }
         d->determineHorizontalAlignment();
     }