From 750df6dec5b65cf4f3c6d7ac7eb2f1263dc89587 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 17 Apr 2018 15:53:37 +0200 Subject: [PATCH] QmlDesigner: Rename Keyframes to KeyframeGroup Change-Id: Ib43d892a3319a0c5ef700147b245e2ba5d3a593b Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/qmltimeline.cpp | 2 +- .../qmldesigner/designercore/model/qmltimelinekeyframes.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp index e8a4626c43a..e91f867a414 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp @@ -233,7 +233,7 @@ void QmlTimeline::addFramesIfNotExists(const ModelNode &node, const PropertyName throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); if (!hasFrames(node, propertyName)) { - ModelNode frames = modelNode().view()->createModelNode("QtQuick.Timeline.Keyframes", 1, 0); + ModelNode frames = modelNode().view()->createModelNode("QtQuick.Timeline.KeyframeGroup", 1, 0); modelNode().defaultNodeListProperty().reparentHere(frames); QmlTimelineFrames(frames).setTarget(node); diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframes.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframes.cpp index b4613281e88..dd184b28548 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframes.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframes.cpp @@ -56,7 +56,7 @@ bool QmlTimelineFrames::isValid() const bool QmlTimelineFrames::isValidQmlTimelineFrames(const ModelNode &modelNode) { return modelNode.isValid() && modelNode.metaInfo().isValid() - && modelNode.metaInfo().isSubclassOf("QtQuick.Timeline.Keyframes"); + && modelNode.metaInfo().isSubclassOf("QtQuick.Timeline.KeyframeGroup"); } void QmlTimelineFrames::destroy() @@ -220,7 +220,7 @@ bool QmlTimelineFrames::isValidKeyframe(const ModelNode &node) bool QmlTimelineFrames::checkKeyframesType(const ModelNode &node) { - return node.isValid() && node.type() == "QtQuick.Timeline.Keyframes"; + return node.isValid() && node.type() == "QtQuick.Timeline.KeyframeGroup"; } QmlTimelineFrames QmlTimelineFrames::keyframesForKeyframe(const ModelNode &node)