From 4ce2c0310c55c78b783b79c1f3fa2e0aa40fe6a2 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Thu, 3 Oct 2013 17:04:40 +0200 Subject: 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 Reviewed-by: Jens Bache-Wiig --- src/quick/items/qquickitemviewtransition.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickitemviewtransition.cpp') 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); -- cgit v1.2.3