diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-09-13 13:03:00 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-09-13 11:39:44 +0000 |
| commit | 73106f330a341f7b1226b45e56856892b2b677ca (patch) | |
| tree | 1bc42597760d9e7f0c10e700ebd31089eee686b1 | |
| parent | 1ff337089a579cf698df0ddb6bf8a68ea9e5de2d (diff) | |
QmlDesigner: Fix pasteKeyframesToTarget()
Because we attached the model inside the transaction,
then transaction begin message was not handled properly.
Change-Id: I77a56d7874061c0af907047e38a37fec4dab12c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp index 4751765874..4d2523b3a3 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp @@ -104,11 +104,9 @@ void TimelineActions::pasteKeyframesToTarget(const ModelNode &targetNode, pasteModel->detachView(&view); + targetNode.view()->model()->attachView(&view); view.executeInTransaction("TimelineActions::pasteKeyframesToTarget", [=, &view](){ - - targetNode.view()->model()->attachView(&view); - ModelNode nonConstTargetNode = targetNode; nonConstTargetNode.validId(); |