diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-18 02:39:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-18 05:17:15 (GMT) |
| commit | f1b1e45c3c66a9061becbee38aaabb3653a20d9d (patch) | |
| tree | 9fdca2013b4d04af29df72786bcbaeda8222aab0 | |
| parent | 05cbd2fe4b5d9cbdef3be52b6d14d2d20255641a (diff) | |
| download | Qt-f1b1e45c3c66a9061becbee38aaabb3653a20d9d.zip Qt-f1b1e45c3c66a9061becbee38aaabb3653a20d9d.tar.gz Qt-f1b1e45c3c66a9061becbee38aaabb3653a20d9d.tar.bz2 | |
Remove unneeded comparison.
d->propertyName is now included in props.
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 4b33af0..e1e247c 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -2150,7 +2150,7 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions, targets.append(d->target); bool hasSelectors = !props.isEmpty() || !targets.isEmpty() || !d->exclude.isEmpty(); - bool useType = (props.isEmpty() && d->propertyName.isEmpty() && d->defaultToInterpolatorType) ? true : false; + bool useType = (props.isEmpty() && d->defaultToInterpolatorType) ? true : false; if (d->defaultProperty.isValid() && !hasSelectors) { props << d->defaultProperty.name(); |