diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-24 10:33:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-24 10:33:07 +0100 |
| commit | 751fa46df9bf06a1003df34b3e74c73c079e8626 (patch) | |
| tree | 1de5e2588702bf8c29030fdfc55115caaa3ff2e2 /src/quick/items/qquickitemanimation.cpp | |
| parent | 70004585f89f325f398c556d101bfa1833d87b53 (diff) | |
| parent | d588ec795bf905d6d4a4827ad74f3d01315e40bf (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickitemanimation.cpp')
| -rw-r--r-- | src/quick/items/qquickitemanimation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index b840ee421c..1d1ea97925 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -486,6 +486,7 @@ void QQuickAnchorAnimation::setDuration(int duration) } /*! + \qmlpropertygroup QtQuick::AnchorAnimation::easing \qmlproperty enumeration QtQuick::AnchorAnimation::easing.type \qmlproperty real QtQuick::AnchorAnimation::easing.amplitude \qmlproperty real QtQuick::AnchorAnimation::easing.overshoot @@ -622,6 +623,7 @@ void QQuickPathAnimation::setDuration(int duration) } /*! + \qmlpropertygroup QtQuick::PathAnimation::easing \qmlproperty enumeration QtQuick::PathAnimation::easing.type \qmlproperty real QtQuick::PathAnimation::easing.amplitude \qmlproperty list<real> QtQuick::PathAnimation::easing.bezierCurve |