diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 01:11:46 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 01:11:46 (GMT) |
| commit | 47318932fc44428fc698fc5d4366e9b59f5c7fb9 (patch) | |
| tree | 7357009416021728fcf1bb3163f0841cc7e946e9 /src/declarative/fx/qfxtext.cpp | |
| parent | 61943383ccff409d60d9837d58e4372dc6f22f23 (diff) | |
| parent | 5a506eefe1ca8f654dcfc354f8ac39547510becf (diff) | |
| download | Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.zip Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.gz Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.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.cpp')
| -rw-r--r-- | src/declarative/fx/qfxtext.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 2542413..315b451 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -603,7 +603,6 @@ QSize QFxTextPrivate::setupTextLayout(QTextLayout *layout) QImage QFxTextPrivate::wrappedTextImage(bool drawStyle) { //do layout - Q_Q(const QFxText); QFont f; if (_font) f = _font->font(); QSize size = cachedLayoutSize; |