feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Rename Keyframes to KeyframeGroup

Browse Source 
Change-Id: Ib43d892a3319a0c5ef700147b245e2ba5d3a593b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2018-04-17 15:53:37 +02:00
parent f406950ef5
commit 750df6dec5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/model/qmltimeline.cpp
View File

@@ -233,7 +233,7 @@ void QmlTimeline::addFramesIfNotExists(const ModelNode &node, const PropertyName
throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
if (!hasFrames(node, propertyName)) { 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); modelNode().defaultNodeListProperty().reparentHere(frames);
QmlTimelineFrames(frames).setTarget(node); QmlTimelineFrames(frames).setTarget(node);

4
src/plugins/qmldesigner/designercore/model/qmltimelinekeyframes.cpp
View File

@@ -56,7 +56,7 @@ bool QmlTimelineFrames::isValid() const
bool QmlTimelineFrames::isValidQmlTimelineFrames(const ModelNode &modelNode) bool QmlTimelineFrames::isValidQmlTimelineFrames(const ModelNode &modelNode)
{ {
return modelNode.isValid() && modelNode.metaInfo().isValid() return modelNode.isValid() && modelNode.metaInfo().isValid()
&& modelNode.metaInfo().isSubclassOf("QtQuick.Timeline.Keyframes"); && modelNode.metaInfo().isSubclassOf("QtQuick.Timeline.KeyframeGroup");
} }
void QmlTimelineFrames::destroy() void QmlTimelineFrames::destroy()
@@ -220,7 +220,7 @@ bool QmlTimelineFrames::isValidKeyframe(const ModelNode &node)
bool QmlTimelineFrames::checkKeyframesType(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) QmlTimelineFrames QmlTimelineFrames::keyframesForKeyframe(const ModelNode &node)