Get rid of QmlFont and use the QFont value type instead.

1 files changed, 2 insertions, 21 deletions

diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h
index bbb54a3..95b566c 100644
--- a/src/declarative/fx/qfxtext_p.h
+++ b/src/declarative/fx/qfxtext_p.h
@@ -69,22 +69,13 @@ class QFxTextPrivate : public QFxItemPrivate
     Q_DECLARE_PUBLIC(QFxText)
 public:
     QFxTextPrivate()
-      : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true),
+      : 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),
         format(QFxText::AutoText)
     {
     }
 
-    ~QFxTextPrivate()
-    {
-        delete _font;
-    }
-
-    void init()
-    {
-    }
-
     void updateSize();
     void checkImgCache();
 
@@ -96,17 +87,7 @@ public:
     QSize setupTextLayout(QTextLayout *layout);
 
     QString text;
-    QmlFont *font()
-    {
-        if (!_font) {
-            Q_Q(QFxText);
-            _font = new QmlFont;
-            QObject::connect(_font, SIGNAL(updated()), q, SLOT(fontChanged()));
-        }
-        return _font;
-    }
-
-    QmlFont *_font;
+    QFont font;
     QColor  color;
     QFxText::TextStyle style;
     QColor  styleColor;