diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2016-12-16 12:58:37 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-02-13 09:54:11 +0000 |
| commit | def6ae900bea0a6e10e765be5d6a814f6e1b0f7a (patch) | |
| tree | 7102cb9f81dcb5ad12fef27a10e7e93f037a1293 /src/animation/frontend/qkeyframeanimation.h | |
| parent | c8308fd1fcf58f8b72dff8982abaeae5ad361fdf (diff) | |
Fix autotests
Change-Id: If7bd1299c7ccd4f5f40714a45025a40ac164db43
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/frontend/qkeyframeanimation.h')
| -rw-r--r-- | src/animation/frontend/qkeyframeanimation.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/animation/frontend/qkeyframeanimation.h b/src/animation/frontend/qkeyframeanimation.h index d34f6cfba..19cb192b4 100644 --- a/src/animation/frontend/qkeyframeanimation.h +++ b/src/animation/frontend/qkeyframeanimation.h @@ -55,7 +55,7 @@ class QT3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation Q_OBJECT Q_PROPERTY(QVector<float> framePositions READ framePositions WRITE setFramePositions NOTIFY framePositionsChanged) Q_PROPERTY(Qt3DCore::QTransform *target READ target WRITE setTarget NOTIFY targetChanged) - Q_PROPERTY(QEasingCurve::Type easing READ easing WRITE setEasing NOTIFY easingChanged) + Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) Q_PROPERTY(QKeyframeAnimation::RepeatMode startMode READ startMode WRITE setStartMode NOTIFY startModeChanged) Q_PROPERTY(QKeyframeAnimation::RepeatMode endMode READ endMode WRITE setEndMode NOTIFY endModeChanged) @@ -74,7 +74,7 @@ public: QVector<float> framePositions() const; QVector<Qt3DCore::QTransform *> keyframeList() const; Qt3DCore::QTransform *target() const; - QEasingCurve::Type easing() const; + QEasingCurve easing() const; QString targetName() const; RepeatMode startMode() const; RepeatMode endMode() const; @@ -86,7 +86,7 @@ public: public Q_SLOTS: void setFramePositions(const QVector<float> &positions); void setTarget(Qt3DCore::QTransform *target); - void setEasing(QEasingCurve::Type easing); + void setEasing(const QEasingCurve &easing); void setTargetName(const QString &name); void setStartMode(RepeatMode mode); void setEndMode(RepeatMode mode); @@ -94,10 +94,10 @@ public Q_SLOTS: Q_SIGNALS: void framePositionsChanged(const QVector<float> &positions); void targetChanged(Qt3DCore::QTransform *target); - void easingChanged(QEasingCurve::Type easing); + void easingChanged(const QEasingCurve &easing); void targetNameChanged(const QString &name); - void startModeChanged(RepeatMode startMode); - void endModeChanged(RepeatMode endMode); + void startModeChanged(QKeyframeAnimation::RepeatMode startMode); + void endModeChanged(QKeyframeAnimation::RepeatMode endMode); private: void updateAnimation(float position); |