diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
| commit | 6470f646d0815f67bab507c1362cdda775c42a6e (patch) | |
| tree | 6389ca2728ec8b78294af60e20b918fdccdf88f1 /src/declarative/extra/qmlbehaviour.h | |
| parent | 50f400ac20e918db1d0a6496003d953dedaba42a (diff) | |
| parent | 3bd0062535aaa991fadf739f9362851afacb19eb (diff) | |
| download | Qt-6470f646d0815f67bab507c1362cdda775c42a6e.zip Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.gz Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/extra/qmlbehaviour.h')
| -rw-r--r-- | src/declarative/extra/qmlbehaviour.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/declarative/extra/qmlbehaviour.h b/src/declarative/extra/qmlbehaviour.h index 1b5f524..99fc779 100644 --- a/src/declarative/extra/qmlbehaviour.h +++ b/src/declarative/extra/qmlbehaviour.h @@ -54,12 +54,10 @@ QT_MODULE(Declarative) class QmlAbstractAnimation; class QmlBehaviourPrivate; -class Q_DECLARATIVE_EXPORT QmlBehaviour : public QmlPropertyValueSource, - public QmlParserStatus +class Q_DECLARATIVE_EXPORT QmlBehaviour : public QmlPropertyValueSource { Q_OBJECT Q_DECLARE_PRIVATE(QmlBehaviour) - Q_INTERFACES(QmlParserStatus) Q_PROPERTY(QVariant from READ fromValue WRITE setFromValue) Q_PROPERTY(QVariant to READ toValue WRITE setToValue) @@ -80,10 +78,6 @@ public: static bool _ignore; -protected: - virtual void classBegin(); - virtual void classComplete(); - private Q_SLOTS: void propertyValueChanged(); }; |