diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
| commit | d588ec795bf905d6d4a4827ad74f3d01315e40bf (patch) | |
| tree | 67227f80379d77962602b758093251b593ee0c08 /src/quick/items/qquickitemanimation.cpp | |
| parent | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (diff) | |
| parent | fdc18a5f25ba1c4cf35e1fa6f21272167bde36a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
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 |