diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-10-03 17:04:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 17:48:34 +0200 |
| commit | 4ce2c0310c55c78b783b79c1f3fa2e0aa40fe6a2 (patch) | |
| tree | 87377c239ce939b9ccb11680e326ca90ca9d44c0 /src/quick/items/qquickitemviewtransition.cpp | |
| parent | df0347a9ed8be8e1d3d771c3d2abcfebec9ed87d (diff) | |
Remane private QQuickAction into QQuickStateAction
This avoid symbol conflicts when statically linking with Qt Quick
Controls, that has its own QQuickAction class and which may become
public some day. (QQuickPropertyAction might be a more apt name, but
it's already taken).
Change-Id: Ia9514d63d38295603a89d8ec5a88815a651380f7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/quick/items/qquickitemviewtransition.cpp')
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 22c0f9426e..0940fe0d22 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -127,8 +127,8 @@ void QQuickItemViewTransitionJob::startTransition(QQuickItemViewTransitionableIt } QQuickStateOperation::ActionList actions; - actions << QQuickAction(item->item, QLatin1String("x"), QVariant(to.x())); - actions << QQuickAction(item->item, QLatin1String("y"), QVariant(to.y())); + actions << QQuickStateAction(item->item, QLatin1String("x"), QVariant(to.x())); + actions << QQuickStateAction(item->item, QLatin1String("y"), QVariant(to.y())); m_transitioner->runningJobs << this; QQuickTransitionManager::transition(actions, trans, item->item); |