diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-03-06 09:28:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 02:45:21 +0100 |
| commit | 14e00670b7393dd16e8896b2365e6d0c154c2d9a (patch) | |
| tree | f9893acf86f8c5af41bd36271d12a296f16902cc /tests/auto/quick/qquickgridview/data | |
| parent | 4b2a7b063bd8a75dd10859d477e53c833fc844fa (diff) | |
prepareTransition() must cancel current transition
If it does not, itemX() or itemY() will still return the current
transition's 'to' position instead of the nextTransitionTo pos that was
scheduled for the next transition (which the item now has moved to
using the direct setPos() method).
Also refactor prepareTransition() to always move the item directly to
the nextTransitionTo if transition is not going ahead.
Also fix some broken test code.
Task-number: QTBUG-24523
Change-Id: I2e536fbc0da2acbf96fdf2d177190a8968f7fdb1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickgridview/data')
| -rw-r--r-- | tests/auto/quick/qquickgridview/data/multipleTransitions.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickgridview/data/multipleTransitions.qml b/tests/auto/quick/qquickgridview/data/multipleTransitions.qml index 909ec3a0b7..f0d932082b 100644 --- a/tests/auto/quick/qquickgridview/data/multipleTransitions.qml +++ b/tests/auto/quick/qquickgridview/data/multipleTransitions.qml @@ -10,7 +10,7 @@ Rectangle { // interrupting transitions will still produce the correct result) property int timeBetweenActions: duration / 2 - property int duration: 300 + property int duration: 100 property int count: grid.count |