summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-01 01:07:32 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-01 01:07:32 (GMT)
commit04c4735798cb7ed811c034c3e097dbbf53f28c9e (patch)
treef126e7af636a07820f0ac655bf0862e327d887ca /src/declarative/util
parent793a06b159ee205752eb8a2d4e7155618af14220 (diff)
downloadQt-04c4735798cb7ed811c034c3e097dbbf53f28c9e.zip
Qt-04c4735798cb7ed811c034c3e097dbbf53f28c9e.tar.gz
Qt-04c4735798cb7ed811c034c3e097dbbf53f28c9e.tar.bz2
Fix animation crash.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index da26bdd..c4eabfe 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -1072,6 +1072,8 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions,
for (int jj = 0; jj < props.count(); ++jj) {
Action myAction;
myAction.property = d->createProperty(obj, props.at(jj));
+ if (!myAction.property.isValid())
+ continue;
myAction.toValue = d->value;
data->actions << myAction;
}
@@ -1895,6 +1897,8 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions,
for (int jj = 0; jj < props.count(); ++jj) {
Action myAction;
myAction.property = d->createProperty(obj, props.at(jj));
+ if (!myAction.property.isValid())
+ continue;
if (d->fromIsDefined) {
d->convertVariant(d->from, (QVariant::Type)(d->interpolatorType ? d->interpolatorType : myAction.property.propertyType()));