summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation.cpp16
-rw-r--r--src/declarative/util/qmlstategroup.cpp2
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp2
3 files changed, 13 insertions, 7 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 3240360..224f668 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -654,7 +654,8 @@ QmlPauseAnimation::~QmlPauseAnimation()
void QmlPauseAnimationPrivate::init()
{
Q_Q(QmlPauseAnimation);
- pa = new QPauseAnimation(q);
+ pa = new QPauseAnimation;
+ QFx_setParent_noEvent(pa, q);
}
/*!
@@ -799,7 +800,8 @@ QmlRunScriptAction::~QmlRunScriptAction()
void QmlRunScriptActionPrivate::init()
{
Q_Q(QmlRunScriptAction);
- rsa = new QActionAnimation(&proxy, q);
+ rsa = new QActionAnimation(&proxy);
+ QFx_setParent_noEvent(rsa, q);
}
/*!
@@ -906,7 +908,8 @@ QmlSetPropertyAction::~QmlSetPropertyAction()
void QmlSetPropertyActionPrivate::init()
{
Q_Q(QmlSetPropertyAction);
- spa = new QActionAnimation(q);
+ spa = new QActionAnimation;
+ QFx_setParent_noEvent(spa, q);
}
/*!
@@ -1096,7 +1099,8 @@ QmlParentChangeAction::~QmlParentChangeAction()
void QmlParentChangeActionPrivate::init()
{
Q_Q(QmlParentChangeAction);
- cpa = new QActionAnimation(q);
+ cpa = new QActionAnimation;
+ QFx_setParent_noEvent(cpa, q);
}
void QmlParentChangeActionPrivate::doAction()
@@ -1494,7 +1498,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/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 3a07fbe..bb40a8b 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -274,7 +274,7 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state,
}
if (oldState == 0 || newState == 0) {
- if (!nullState) { nullState = new QmlState(q); }
+ if (!nullState) { nullState = new QmlState; QFx_setParent_noEvent(nullState, q); }
if (!oldState) oldState = nullState;
if (!newState) newState = nullState;
}
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) {