diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
| commit | 539206ac11fc341db6e29ebdc3c838848f822bc5 (patch) | |
| tree | a7e1a7f79bf2a1140446f06a1aed01786be13f18 /src/declarative/util/qmlfollow.h | |
| parent | 4c0abed6af10a2722ad3f1fd352caa3fe673468e (diff) | |
| parent | ae7a3485c0e6748361789491af33ee7b7fe093bc (diff) | |
| download | Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.zip Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.gz Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlfollow.h')
| -rw-r--r-- | src/declarative/util/qmlfollow.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h index 1f6376a..ff34d08 100644 --- a/src/declarative/util/qmlfollow.h +++ b/src/declarative/util/qmlfollow.h @@ -52,13 +52,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QmlFollowPrivate; -class Q_DECLARATIVE_EXPORT QmlFollow : public QObject, public QmlPropertyValueSource, - public QmlParserStatus +class Q_DECLARATIVE_EXPORT QmlFollow : public QObject, + public QmlPropertyValueSource { Q_OBJECT Q_DECLARE_PRIVATE(QmlFollow) Q_INTERFACES(QmlPropertyValueSource) - Q_INTERFACES(QmlParserStatus) Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue) Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity) |