diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
| commit | e484ee27f929aca738a269947237d834dab89b39 (patch) | |
| tree | 216f95598411eb4c72141308973695d5e0d8b372 /src/declarative/fx/qfxtext_p.h | |
| parent | ded29009f766a8373193d94bcb8309270f66a266 (diff) | |
| parent | d1f1f2c91f63609ca1ffad32efdd6590f9f0ce6a (diff) | |
| download | Qt-e484ee27f929aca738a269947237d834dab89b39.zip Qt-e484ee27f929aca738a269947237d834dab89b39.tar.gz Qt-e484ee27f929aca738a269947237d834dab89b39.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxtext_p.h')
| -rw-r--r-- | src/declarative/fx/qfxtext_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h index 4296891..8bb3142 100644 --- a/src/declarative/fx/qfxtext_p.h +++ b/src/declarative/fx/qfxtext_p.h @@ -56,6 +56,7 @@ #include "qfxitem.h" #include "qfxitem_p.h" #include "qml.h" +#include <QtGui/qtextlayout.h> #if defined(QFX_RENDER_OPENGL) #include "gltexture.h" @@ -72,7 +73,9 @@ class QFxTextPrivate : public QFxItemPrivate Q_DECLARE_PUBLIC(QFxText) public: QFxTextPrivate() - : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0) + : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), + hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), + dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0) { } @@ -126,6 +129,8 @@ public: bool singleline; QTextControl *control; QTextDocument *doc; + QTextLayout layout; + QSize cachedLayoutSize; }; QT_END_NAMESPACE |