diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-22 16:59:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 16:07:44 +0100 |
| commit | 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (patch) | |
| tree | 35517eeb69916fed3e8e803cf4bd190125f538b6 /src/quick/items/qquickitemanimation.cpp | |
| parent | 367cf77cd64f1b72496cde5484554ff7a8134f1d (diff) | |
Renamed QQuickItem::pos property to position
Abbreviated property names are less descriptive so we don't have
many of them. Might as well be consistent. QWindow::pos was already
renamed.
Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/quick/items/qquickitemanimation.cpp')
| -rw-r--r-- | src/quick/items/qquickitemanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index ef2248d2cf..769f17ffc8 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -899,7 +899,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actio QPointF pathPos = QQuickPath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV); if (!prevData.anchorPoint.isNull()) pathPos -= prevData.anchorPoint; - if (pathPos == data->target->pos()) { //only treat as interruption if we interrupted ourself + if (pathPos == data->target->position()) { //only treat as interruption if we interrupted ourself data->painterPath = prevData.painterPath; data->toDefined = data->fromDefined = data->fromSourced = true; data->prevBez.isValid = false; @@ -961,7 +961,7 @@ void QQuickPathAnimationUpdater::setValue(qreal v) } } - target->setPos(currentPos); + target->setPosition(currentPos); //adjust angle according to orientation if (!fixed) { |