aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-10-21 09:31:01 +0200
committerEike Ziller <eike.ziller@qt.io>2020-10-21 09:31:01 +0200
commitdbb62016052ad70e8e3dffb60a419504c9eb6dac (patch)
tree7926ab117c9932be15b8886ba5230048da97bc07 /src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
parent526579b09d1be00ef2f0e371e0c57064777e6538 (diff)
parentcc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff)
Merge remote-tracking branch 'origin/4.14' into master
Diffstat (limited to 'src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp')
-rw-r--r--src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
index 9d858d684c..b84d386f8e 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
@@ -42,7 +42,7 @@ namespace QmlDesigner {
CurveEditorView::CurveEditorView(QObject *parent)
: AbstractView(parent)
, m_block(false)
- , m_model(new DesignTools::CurveEditorModel(0., 500.))
+ , m_model(new DesignTools::CurveEditorModel())
, m_editor(new DesignTools::CurveEditor(m_model))
{
Q_UNUSED(parent);
@@ -267,7 +267,7 @@ ModelNode getTargetNode1(DesignTools::PropertyTreeItem *item, const QmlTimeline
QString targetId = nodeItem->name();
if (timeline.isValid()) {
for (auto &&target : timeline.allTargets()) {
- if (target.displayName() == targetId)
+ if (target.isValid() && target.displayName() == targetId)
return target;
}
}