summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2018-11-08 15:30:45 +0100
committerTim Jenssen <tim.jenssen@qt.io>2018-11-20 09:31:11 +0000
commit6a41d2b8f2bd918426f0c359ddf8780b83c6aa77 (patch)
tree2ae884c97f15fcb40bee6642f64c2a0518dd7114
parent40185c0359ce2de3af987ec20353387949723ba2 (diff)
downloadqt-creator-6a41d2b8f2bd918426f0c359ddf8780b83c6aa77.tar.gz
QmlDesigner: Fix check for timeline
This is a much safer and better check if a timeline is active. Change-Id: I54b5e0f0579ea172a56c83edf0b8e41b4bfc1598 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmltimeline.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp
index 04139385d2..e484848261 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp
@@ -213,12 +213,7 @@ bool QmlTimeline::hasActiveTimeline(AbstractView *view)
if (!view->model()->hasImport(Import::createLibraryImport("QtQuick.Timeline", "1.0"), true, true))
return false;
- const ModelNode root = view->rootModelNode();
- if (root.isValid())
- for (const ModelNode &child : root.directSubModelNodes()) {
- if (QmlTimeline::isValidQmlTimeline(child))
- return QmlTimeline(child).isEnabled();
- }
+ return view->currentTimeline().isValid();
}
return false;