diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 05:59:50 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-18 05:17:14 (GMT) |
commit | 32898d39fbbe0939b6bb21da7f3ad725fb8e0ee3 (patch) | |
tree | ac3d3ca0597d5b1a573d1f414b728f7644a0788e /src/declarative/util/qmlanimation_p_p.h | |
parent | ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6 (diff) | |
download | Qt-32898d39fbbe0939b6bb21da7f3ad725fb8e0ee3.zip Qt-32898d39fbbe0939b6bb21da7f3ad725fb8e0ee3.tar.gz Qt-32898d39fbbe0939b6bb21da7f3ad725fb8e0ee3.tar.bz2 |
Minor animation class cleanup.
Diffstat (limited to 'src/declarative/util/qmlanimation_p_p.h')
-rw-r--r-- | src/declarative/util/qmlanimation_p_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index 2dc59f9..91f9f88 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -108,6 +108,8 @@ public: { if (state() == Running) stop(); + if (policy == DeleteWhenStopped) + delete animAction; animAction = action; policy = p; } @@ -126,12 +128,12 @@ protected: animAction = 0; } } - } else if (newState == Stopped && policy == DeleteWhenStopped) { + } /*else if (newState == Stopped && policy == DeleteWhenStopped) { if (!running) { delete animAction; animAction = 0; } - } + }*/ } private: @@ -222,9 +224,8 @@ public: void commence(); - QmlNullableValue<QmlMetaProperty> userProperty; + QmlMetaProperty defaultProperty; - QmlMetaProperty property; QmlAnimationGroup *group; static QmlMetaProperty createProperty(QObject *obj, const QString &str, QObject *infoObj); |