Add textFormat property to the Text element.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index ee38a94..bd91f0e 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -58,6 +58,7 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
     Q_ENUMS(HAlignment)
     Q_ENUMS(VAlignment)
     Q_ENUMS(TextStyle)
+    Q_ENUMS(TextFormat)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QmlFont *font READ font CONSTANT)
@@ -67,6 +68,7 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
     Q_PROPERTY(HAlignment hAlign READ hAlign WRITE setHAlign)
     Q_PROPERTY(VAlignment vAlign READ vAlign WRITE setVAlign)
     Q_PROPERTY(bool wrap READ wrap WRITE setWrap)
+    Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
     Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode)
     Q_PROPERTY(QString activeLink READ activeLink)
     Q_PROPERTY(bool smooth READ smoothTransform WRITE setSmoothTransform)
@@ -85,6 +87,9 @@ public:
                       Outline,
                       Raised,
                       Sunken };
+    enum TextFormat { AutoText,
+                      PlainText,
+                      RichText };
 
     QString text() const;
     void setText(const QString &);
@@ -109,6 +114,9 @@ public:
     bool wrap() const;
     void setWrap(bool w);
 
+    TextFormat textFormat() const;
+    void setTextFormat(TextFormat format);
+
     Qt::TextElideMode elideMode() const;
     void setElideMode(Qt::TextElideMode);