diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 01:50:16 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 01:50:16 (GMT) |
| commit | b8fba323c817a00df3c3639eb172104cf68d259d (patch) | |
| tree | 437edb5e7c0672636f2bcc7fa3af59665b99d0d6 /src/declarative/fx/qfxtext.h | |
| parent | c1283b68d5b02afb5f225d455ae057753b91a5b9 (diff) | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| download | Qt-b8fba323c817a00df3c3639eb172104cf68d259d.zip Qt-b8fba323c817a00df3c3639eb172104cf68d259d.tar.gz Qt-b8fba323c817a00df3c3639eb172104cf68d259d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' into kinetic-declarativeui-gv
Conflicts:
src/declarative/canvas/qsimplecanvasitem.cpp
src/declarative/canvas/qsimplecanvasitem_p.h
src/declarative/fx/qfxwebview.cpp
Diffstat (limited to 'src/declarative/fx/qfxtext.h')
| -rw-r--r-- | src/declarative/fx/qfxtext.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index 10b85f0..2358fe3 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -69,7 +69,6 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem Q_PROPERTY(bool wrap READ wrap WRITE setWrap) Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode) Q_PROPERTY(QString activeLink READ activeLink) - Q_CLASSINFO("DefaultProperty", "text") public: QFxText(QFxItem *parent=0); |