1 files changed, 38 insertions, 39 deletions

diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index b7649c9952..365a8fc588 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qquickitemviewtransition_p.h"
 #include <QtQuick/qquickitem.h>
@@ -125,6 +89,8 @@ void QQuickItemViewTransitionJob::startTransition(QQuickItemViewTransitionableIt
     actions << QQuickStateAction(item->item, QLatin1String("x"), QVariant(to.x()));
     actions << QQuickStateAction(item->item, QLatin1String("y"), QVariant(to.y()));
 
+    actions[0].fromValue = item->itemX();
+    actions[1].fromValue = item->itemY();
     m_transitioner->runningJobs << this;
     QQuickTransitionManager::transition(actions, trans, item->item);
 }
@@ -500,6 +466,37 @@ void QQuickItemViewTransitionableItem::startTransition(QQuickItemViewTransitione
     clearCurrentScheduledTransition();
 }
 
+void QQuickItemViewTransitionableItem::completeTransition(QQuickTransition *quickTransition)
+{
+    if (nextTransitionType == QQuickItemViewTransitioner::NoTransition)
+        return;
+
+    if (!prepared) {
+        qWarning("QQuickViewItem::prepareTransition() not called!");
+        return;
+    }
+
+    if (!item) {
+        qWarning("No target for transition!");
+        return;
+    }
+
+    if (!transition || transition->m_type != nextTransitionType || transition->m_isTarget != isTransitionTarget) {
+        if (transition)
+            RETURN_IF_DELETED(transition->cancel());
+        delete transition;
+        transition = new QQuickItemViewTransitionJob;
+    }
+
+    QQuickStateOperation::ActionList actions; // not used
+    QList<QQmlProperty> after; // not used
+    QScopedPointer<QQuickTransitionInstance> instance(
+                quickTransition->prepare(actions, after, transition, item));
+    RETURN_IF_DELETED(instance->complete());
+
+    clearCurrentScheduledTransition();
+}
+
 void QQuickItemViewTransitionableItem::setNextTransition(QQuickItemViewTransitioner::TransitionType type, bool isTargetItem)
 {
     // Don't reset nextTransitionToSet - once it is set, it cannot be changed
@@ -549,13 +546,15 @@ void QQuickItemViewTransitionableItem::stopTransition()
 {
     if (transition)
         RETURN_IF_DELETED(transition->cancel());
+    delete transition;
+    transition = nullptr;
     clearCurrentScheduledTransition();
     resetNextTransitionPos();
 }
 
 
 QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
-    : QObject(parent), m_item(nullptr), m_index(-1)
+    : QObject(parent), m_index(-1)
 {
 }
 /*!