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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/qmldesigner/designercore/include/qmltimeline.h b/src/plugins/qmldesigner/designercore/include/qmltimeline.h
index a92a2921198..c04fd454c0c 100644
--- a/src/plugins/qmldesigner/designercore/include/qmltimeline.h
+++ b/src/plugins/qmldesigner/designercore/include/qmltimeline.h
@@ -71,10 +71,10 @@ public:
     void toogleRecording(bool b) const;
 
     void resetGroupRecording() const;
+    bool hasKeyframeGroup(const ModelNode &node, const PropertyName &propertyName) const;
 
 private:
     void addKeyframeGroupIfNotExists(const ModelNode &node, const PropertyName &propertyName);
-    bool hasKeyframeGroup(const ModelNode &node, const PropertyName &propertyName) const;
     QList<QmlTimelineKeyframeGroup> allKeyframeGroups() const;
 };
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 745fdc4d00b..65ed482bfb1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -63,7 +63,7 @@ void QmlObjectNode::setVariantProperty(const PropertyName &name, const QVariant
         timelineFrames.setValue(value, frame);
 
         return;
-    } else if (modelNode().hasId() && timelineIsActive()) {
+    } else if (modelNode().hasId() && timelineIsActive() && currentTimeline().hasKeyframeGroup(modelNode(), name)) {
         QmlTimelineKeyframeGroup timelineFrames(currentTimeline().keyframeGroup(modelNode(), name));
 
         Q_ASSERT(timelineFrames.isValid());