diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-11-28 11:26:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 11:11:53 +0100 |
| commit | 8872c0716fb33e33311a78e693b61d3dd6b656c1 (patch) | |
| tree | 01b970d0cc196cb99b971f9905d3a002a1a97190 /src/quick/items/qquicktext_p_p.h | |
| parent | 76ed62fb836ea3e3e5236f8ed567f7ac64dd63fc (diff) | |
Support inline images with <img> tag in StyledText
Task-number: QTBUG-21793
Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 40c50378f0..e7b0478e21 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -60,6 +60,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qtextlayout.h> +#include <private/qdeclarativestyledtext_p.h> QT_BEGIN_NAMESPACE @@ -82,6 +83,7 @@ public: void mirrorChange(); QTextDocument *textDocument(); bool isLineLaidOutConnected(); + void setLineGeometry(QTextLine &line, qreal lineWidth, qreal &height); QString text; QUrl baseUrl; @@ -127,6 +129,7 @@ public: bool richTextAsImage:1; bool textureImageCacheDirty:1; bool textHasChanged:1; + bool needToUpdateLayout:1; QRect layedOutTextRect; QSize paintedSize; @@ -168,6 +171,10 @@ public: }; UpdateType updateType; + QList<QDeclarativeStyledTextImgTag*> imgTags; + QList<QDeclarativeStyledTextImgTag*> visibleImgTags; + int nbActiveDownloads; + #if defined(Q_OS_MAC) QList<QRectF> linesRects; QThread *layoutThread; |