From 4022e330fb18ff0bf8cb6ebc166511c4f5c4c030 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 20 Apr 2021 16:19:40 +0200 Subject: [PATCH] QmlDesigner: Use AbstractView::currentTimeline There should be only 'one' current timeline. Let's keep the QTC_ASSERT until we know this does not introduce issues. Change-Id: I1518bef39b290732bda5dc6e5fc571c33f7407f2 Reviewed-by: Knud Dollereder Reviewed-by: Thomas Hartmann --- .../components/timelineeditor/timelinegraphicsscene.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp index c86d3fffdbe..0b67542fc6f 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp @@ -511,7 +511,11 @@ QGraphicsView *AbstractScrollGraphicsScene::rulerView() const QmlTimeline TimelineGraphicsScene::currentTimeline() const { - return QmlTimeline(timelineModelNode()); + QmlTimeline timeline(timelineModelNode()); + if (timeline.isValid()) { + QTC_ASSERT(timeline == timelineView()->currentTimeline(), ;); + } + return timelineView()->currentTimeline(); } QRectF AbstractScrollGraphicsScene::selectionBounds() const