diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
| commit | fd2616977e5e03afa3be9b455bc0a6be19f9132f (patch) | |
| tree | b71404860117132253b7e76832adf28748ca81cb /src/declarative/util/qmlanimation.cpp | |
| parent | 12f4fc296578fb30ac1bf690b3eeba176b72205a (diff) | |
| parent | 219e2fa7ace74d87fda4ed8c3a2a75005fab10b9 (diff) | |
| download | Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.zip Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.gz Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/qmlbehavior.cpp
src/declarative/extra/qmlbehavior.h
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index cbf4114..c535045 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) { } |