diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
| commit | a20948b726c1e0edd70761e8e115a53ba5526a51 (patch) | |
| tree | cdcf3367f67c465f005a97dec6141e5a4e024781 /src/controls/StackView.qml | |
| parent | 3434a0d5f8cb4bb5008caec3772c4e398986196f (diff) | |
| parent | 1c54d411ad6e98c3779a412750aec8b93d587872 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/layouts/qquicklinearlayout.cpp
Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
Diffstat (limited to 'src/controls/StackView.qml')
| -rw-r--r-- | src/controls/StackView.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index d8089174e..2397e5e40 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -312,7 +312,7 @@ import QtQuick.Controls.Private 1.0 contains the properties \c enterItem and \c exitItem. You set the target of your inner animations to those items. Since the same items instance can be pushed several times to a StackView, you should always override - \l {StackViewDelegate::transitionFinished(properties)}{StackViewDelegate.transitionFinished(properties)}. + \l {StackViewDelegate::transitionFinished()}{StackViewDelegate.transitionFinished()}. Implement this function to reset any properties animated on the exitItem so that later transitions can expect the items to be in a default state. @@ -360,7 +360,7 @@ import QtQuick.Controls.Private 1.0 \section2 Advanced usage When the StackView needs a new transition, it first calls - \l {StackViewDelegate::getTransition(properties)}{StackViewDelegate.getTransition(properties)}. + \l {StackViewDelegate::getTransition()}{StackViewDelegate.getTransition()}. The base implementation of this function just looks for a property named \c properties.name inside itself (root), which is how it finds \c {property Component pushTransition} in the examples above. |