summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/util/qmlanimation.cpp4
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 3240360..f3691ea 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -1494,7 +1494,9 @@ QmlPropertyAnimation::~QmlPropertyAnimation()
void QmlPropertyAnimationPrivate::init()
{
Q_Q(QmlPropertyAnimation);
- va = new QmlTimeLineValueAnimator(q);
+ va = new QmlTimeLineValueAnimator;
+ QFx_setParent_noEvent(va, q);
+
va->setStartValue(QVariant(0.0f));
va->setEndValue(QVariant(1.0f));
}
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index be082f8..f04a821 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -242,7 +242,7 @@ void QmlTransitionManager::transition(const QList<Action> &list,
d->applyBindings();
}
-#include <QDebug>
+
void QmlTransitionManager::cancel()
{
if (d->transition) {