aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2017-12-14 12:48:14 +0100
committerTim Jenssen <tim.jenssen@qt.io>2017-12-14 14:03:47 +0000
commitcb02df8b4e51a9f19df705cb1174ef5907068c02 (patch)
tree7bca7676dd5e05b768ec1300c11d1b0ce10c7885
parent89bb540a871361afdc2f46af2d752ce4b5c3637e (diff)
Fix crash
The timeline was crashing if the target was undefined e.g. the id was missing. Change-Id: I3633481d6431f2d0a61ae770e865f3bc8a70ab37 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--src/imports/timeline/qquickkeyframe.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp
index 8984cba..5cf75e8 100644
--- a/src/imports/timeline/qquickkeyframe.cpp
+++ b/src/imports/timeline/qquickkeyframe.cpp
@@ -225,15 +225,18 @@ QVariant QQuickKeyframes::evaluate(qreal frame) const
void QQuickKeyframes::setProperty(qreal frame)
{
- QQmlProperty qmlProperty(target(), property());
+ if (target()) {
+ QQmlProperty qmlProperty(target(), property());
- qmlProperty.write(evaluate(frame));
+ qmlProperty.write(evaluate(frame));
+ }
}
void QQuickKeyframes::init()
{
Q_D(QQuickKeyframes);
- d->originalValue = QQmlProperty::read(target(), property());
+ if (target())
+ d->originalValue = QQmlProperty::read(target(), property());
}
void QQuickKeyframes::resetDefaultValue()