aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2018-04-27 14:14:31 +0200
committerTim Jenssen <tim.jenssen@qt.io>2018-04-27 12:30:07 +0000
commit30c03aa5b05baab7a5190ce40db029a50ad935f6 (patch)
treea8c3a07560002ff5ad5b42b448faa5714e6d25b7
parent88e6910f54fda1c4cfe6e711e0e1c53849dd030b (diff)
Fix crash
The property we are trying to interpolate Change-Id: I48e99e8a603a6bc1749f1da8fcb7461c13b87f7e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/imports/timeline/qquickkeyframe.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp
index 2fa7d86..5ea84f0 100644
--- a/src/imports/timeline/qquickkeyframe.cpp
+++ b/src/imports/timeline/qquickkeyframe.cpp
@@ -329,7 +329,12 @@ QVariant QQuickKeyframe::evaluate(QQuickKeyframe *pre, qreal frametime, int user
QVariant convertedValue = value();
convertedValue.convert(userType);
- return interpolator(preValue.constData(), convertedValue.constData(), progress);
+ if (preValue.isValid() && convertedValue.isValid())
+ return interpolator(preValue.constData(), convertedValue.constData(), progress);
+
+ qWarning() << "invalid keyframe target";
+
+ return QVariant();
}
QT_END_NAMESPACE