2 files changed, 10 insertions, 1 deletions
diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp
index 0d215b470..c75b92d47 100644
--- a/src/animation/frontend/qabstractclipanimator.cpp
+++ b/src/animation/frontend/qabstractclipanimator.cpp
@@ -54,7 +54,7 @@ QAbstractClipAnimatorPrivate::QAbstractClipAnimatorPrivate()
 }
 
 /*!
-    \qmltype AbsractClipAnimator
+    \qmltype AbstractClipAnimator
     \instantiates Qt3DAnimation::QAbstractClipAnimator
     \inqmlmodule Qt3D.Animation
     \since 5.9
diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp
index b3d3816a0..faa77f5db 100644
--- a/src/animation/frontend/qchannelmapping.cpp
+++ b/src/animation/frontend/qchannelmapping.cpp
@@ -74,6 +74,15 @@ void QChannelMappingPrivate::updatePropertyNameAndType()
         QMetaProperty mp = mo->property(propertyIndex);
         propertyName = mp.name();
         type = mp.userType();
+        if (type == QMetaType::QVariant) {
+            QVariant currentValue = m_target->property(mp.name());
+            if (currentValue.isValid()) {
+                type = currentValue.userType();
+            } else {
+                qWarning("QChannelMapping: Attempted to target QVariant property with no value set. "
+                         "Set a value first in order to be able to determine the type.");
+            }
+        }
     }
 
     if (m_type != type) {