summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation.cpp4
-rw-r--r--src/declarative/util/qmlanimation.h2
-rw-r--r--src/declarative/util/qmlfollow.cpp2
-rw-r--r--src/declarative/util/qmlfollow.h3
4 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 89b5660..cbddb91 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -154,7 +154,7 @@ QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation)
*/
QmlAbstractAnimation::QmlAbstractAnimation(QObject *parent)
-: QmlPropertyValueSource(*(new QmlAbstractAnimationPrivate), parent)
+: QObject(*(new QmlAbstractAnimationPrivate), parent)
{
}
@@ -163,7 +163,7 @@ QmlAbstractAnimation::~QmlAbstractAnimation()
}
QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObject *parent)
-: QmlPropertyValueSource(dd, parent)
+: QObject(dd, parent)
{
}
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index ba1e430..a898be8 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -58,7 +58,7 @@ QT_MODULE(Declarative)
class QmlAbstractAnimationPrivate;
class QmlAnimationGroup;
-class QmlAbstractAnimation : public QmlPropertyValueSource, public QmlParserStatus
+class QmlAbstractAnimation : public QObject, public QmlPropertyValueSource, public QmlParserStatus
{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlAbstractAnimation)
diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp
index eec2480..fe5303f 100644
--- a/src/declarative/util/qmlfollow.cpp
+++ b/src/declarative/util/qmlfollow.cpp
@@ -239,7 +239,7 @@ void QmlFollowPrivate::stop()
*/
QmlFollow::QmlFollow(QObject *parent)
-: QmlPropertyValueSource(*(new QmlFollowPrivate),parent)
+: QObject(*(new QmlFollowPrivate),parent)
{
}
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index 07b2f49..1f6376a 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -52,11 +52,12 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QmlFollowPrivate;
-class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource,
+class Q_DECLARATIVE_EXPORT QmlFollow : public QObject, public QmlPropertyValueSource,
public QmlParserStatus
{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlFollow)
+ Q_INTERFACES(QmlPropertyValueSource)
Q_INTERFACES(QmlParserStatus)
Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue)