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

Merge "Merge remote-tracking branch 'origin/4.8' into 4.9" into 4.9

Browse Source
This commit is contained in:
Eike Ziller
2019-03-14 09:24:57 +00:00
committed by The Qt Project
parent ec1c77fc8a d4be00586e
commit e3e45e9e8b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/qmltimeline.h
View File

@@ -71,10 +71,10 @@ public:
void toogleRecording(bool b) const; void toogleRecording(bool b) const;
void resetGroupRecording() const; void resetGroupRecording() const;
bool hasKeyframeGroup(const ModelNode &node, const PropertyName &propertyName) const;
private: private:
void addKeyframeGroupIfNotExists(const ModelNode &node, const PropertyName &propertyName); void addKeyframeGroupIfNotExists(const ModelNode &node, const PropertyName &propertyName);
bool hasKeyframeGroup(const ModelNode &node, const PropertyName &propertyName) const;
QList<QmlTimelineKeyframeGroup> allKeyframeGroups() const; QList<QmlTimelineKeyframeGroup> allKeyframeGroups() const;
}; };

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

@@ -63,7 +63,7 @@ void QmlObjectNode::setVariantProperty(const PropertyName &name, const QVariant
timelineFrames.setValue(value, frame); timelineFrames.setValue(value, frame);
return; return;
} else if (modelNode().hasId() && timelineIsActive()) { } else if (modelNode().hasId() && timelineIsActive() && currentTimeline().hasKeyframeGroup(modelNode(), name)) {
QmlTimelineKeyframeGroup timelineFrames(currentTimeline().keyframeGroup(modelNode(), name)); QmlTimelineKeyframeGroup timelineFrames(currentTimeline().keyframeGroup(modelNode(), name));
Q_ASSERT(timelineFrames.isValid()); Q_ASSERT(timelineFrames.isValid());