diff options
author | Yoann Lopes <yoann.lopes@nokia.com> | 2011-06-01 14:49:53 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@nokia.com> | 2011-06-01 15:56:36 +0200 |
commit | 0e2aaa5a28349d7c906005ae12dd8656ca07b53e (patch) | |
tree | e2bbb6e9fb30a4a36d3df30e0f73945d237ad743 /src/declarative/items/qsgtext_p_p.h | |
parent | ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2 (diff) |
Fix images not being rendered when embedded in a rich text.
In that case the whole text is cached in a QImage, but that cache was
not updated when the embedded image was finished to be loaded.
Depends on ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2.
Task-number: QTBUG-19428
Diffstat (limited to 'src/declarative/items/qsgtext_p_p.h')
-rw-r--r-- | src/declarative/items/qsgtext_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/items/qsgtext_p_p.h b/src/declarative/items/qsgtext_p_p.h index a3836a19f8..9c0d5b11d9 100644 --- a/src/declarative/items/qsgtext_p_p.h +++ b/src/declarative/items/qsgtext_p_p.h @@ -120,12 +120,13 @@ public: bool hAlignImplicit:1; bool rightToLeftText:1; bool layoutTextElided:1; + bool richTextAsImage:1; QRect layedOutTextRect; QSize paintedSize; qreal naturalWidth; virtual qreal getImplicitWidth() const; - + void ensureDoc(); QPixmap textDocumentImage(bool drawStyle); QSGTextDocumentWithImageResources *doc; |