Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Change-Id: I5e0eef69a31bcfda65cf965fb4c8c330581e5168

1 files changed, 8 insertions, 8 deletions

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index e5e25d141b..4cf019c7f0 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -1996,7 +1996,7 @@ void QQuickPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
 }
 
 QQuickBulkValueAnimator::QQuickBulkValueAnimator()
-    : QAbstractAnimationJob(), animValue(nullptr), fromSourced(nullptr), m_duration(250)
+    : QAbstractAnimationJob(), animValue(nullptr), fromIsSourced(nullptr), m_duration(250)
 {
 }
 
@@ -2026,8 +2026,8 @@ void QQuickBulkValueAnimator::updateCurrentTime(int currentTime)
 void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 {
     //check for new from every top-level loop (when the top level animation is started and all subsequent loops)
-    if (fromSourced)
-        *fromSourced = false;
+    if (fromIsSourced)
+        *fromIsSourced = false;
     QAbstractAnimationJob::topLevelAnimationLoopChanged();
 }
 
@@ -2596,7 +2596,7 @@ void QQuickAnimationPropertyUpdater::setValue(qreal v)
         if (v == 1.) {
             QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyData::BypassInterceptor | QQmlPropertyData::DontRemoveBinding);
         } else {
-            if (!fromSourced && !fromDefined) {
+            if (!fromIsSourced && !fromIsDefined) {
                 action.fromValue = action.property.read();
                 if (interpolatorType) {
                     QQuickPropertyAnimationPrivate::convertVariant(action.fromValue, interpolatorType);
@@ -2616,7 +2616,7 @@ void QQuickAnimationPropertyUpdater::setValue(qreal v)
             return;
     }
     wasDeleted = nullptr;
-    fromSourced = true;
+    fromIsSourced = true;
 }
 
 void QQuickAnimationPropertyUpdater::debugUpdater(QDebug d, int indentLevel) const
@@ -2760,11 +2760,11 @@ QAbstractAnimationJob* QQuickPropertyAnimation::transition(QQuickStateActions &a
         data->interpolatorType = d->interpolatorType;
         data->interpolator = d->interpolator;
         data->reverse = direction == Backward ? true : false;
-        data->fromSourced = false;
-        data->fromDefined = d->fromIsDefined;
+        data->fromIsSourced = false;
+        data->fromIsDefined = d->fromIsDefined;
         data->actions = dataActions;
         animator->setAnimValue(data);
-        animator->setFromSourcedValue(&data->fromSourced);
+        animator->setFromIsSourcedValue(&data->fromIsSourced);
         d->actions = &data->actions; //remove this?
     }