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, 4 insertions, 4 deletions

diff --git a/src/quick/util/qquickanimator_p_p.h b/src/quick/util/qquickanimator_p_p.h
index b176119c70..33e202c522 100644
--- a/src/quick/util/qquickanimator_p_p.h
+++ b/src/quick/util/qquickanimator_p_p.h
@@ -68,8 +68,8 @@ public:
         , duration(250)
         , from(0)
         , to(0)
-        , isFromDefined(false)
-        , isToDefined(false)
+        , fromIsDefined(false)
+        , toIsDefined(false)
     {
     }
 
@@ -79,8 +79,8 @@ public:
     qreal from;
     qreal to;
 
-    uint isFromDefined : 1;
-    uint isToDefined : 1;
+    uint fromIsDefined : 1;
+    uint toIsDefined : 1;
 
     void apply(QQuickAnimatorJob *job, const QString &propertyName, QQuickStateActions &actions, QQmlProperties &modified, QObject *defaultTarget);
 };