summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation_p.h
diff options
context:
space:
mode:
authorLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-04-29 12:58:38 (GMT)
committerLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-04-30 09:31:53 (GMT)
commit2e71dc6b97dfa0f8193162019da326aa32291d5e (patch)
tree739596f22e14ad612b24f7e841e54c2e8d052c0a /src/declarative/util/qmlanimation_p.h
parente2bfab6f145ddc61ef21590e69c709456e430d1c (diff)
downloadQt-2e71dc6b97dfa0f8193162019da326aa32291d5e.zip
Qt-2e71dc6b97dfa0f8193162019da326aa32291d5e.tar.gz
Qt-2e71dc6b97dfa0f8193162019da326aa32291d5e.tar.bz2
Using qvariant color interpolator for QmlColorAnimation
Diffstat (limited to 'src/declarative/util/qmlanimation_p.h')
-rw-r--r--src/declarative/util/qmlanimation_p.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 728584c..0ef89f4 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -203,7 +203,11 @@ class QmlColorAnimationPrivate : public QmlAbstractAnimationPrivate
Q_DECLARE_PUBLIC(QmlColorAnimation);
public:
QmlColorAnimationPrivate()
- : QmlAbstractAnimationPrivate(), fromSourced(false), ca(0), value(this, &QmlColorAnimationPrivate::valueChanged) {}
+ : QmlAbstractAnimationPrivate(), fromSourced(false), ca(0), value(this, &QmlColorAnimationPrivate::valueChanged)
+ {
+ if (!colorInterpolator)
+ colorInterpolator = QVariantAnimationPrivate::getInterpolator(QVariant::Color);
+ }
void init();
@@ -218,6 +222,8 @@ public:
virtual void valueChanged(qreal);
QmlTimeLineValueProxy<QmlColorAnimationPrivate> value;
+
+ static QVariantAnimation::Interpolator colorInterpolator;
};
class QmlRunScriptActionPrivate : public QmlAbstractAnimationPrivate