diff options
Diffstat (limited to 'src/declarative/fx/qfxtext.h')
| -rw-r--r-- | src/declarative/fx/qfxtext.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index edf6031..4349432 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -68,7 +68,6 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem 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) public: QFxText(QFxItem *parent=0); @@ -84,9 +83,9 @@ public: Outline, Raised, Sunken }; - enum TextFormat { AutoText, - PlainText, - RichText }; + enum TextFormat { PlainText = Qt::PlainText, + RichText = Qt::RichText, + AutoText = Qt::AutoText}; QString text() const; void setText(const QString &); @@ -118,8 +117,6 @@ public: Qt::TextElideMode elideMode() const; void setElideMode(Qt::TextElideMode); - QString activeLink() const; - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); virtual void componentComplete(); |