Merge remote-tracking branch 'origin/7.0' into 8.0

Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943

1 files changed, 30 insertions, 0 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 6422765ec3..abdba53823 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -56,6 +56,7 @@ void RewriteActionCompressor::operator()(QList<RewriteAction *> &actions,
     compressImports(actions);
     compressRereparentActions(actions);
     compressReparentIntoSamePropertyActions(actions);
+    compressReparentIntoNewPropertyActions(actions);
     compressPropertyActions(actions);
     compressAddEditRemoveNodeActions(actions);
     compressAddEditActions(actions, tabSettings);
@@ -152,6 +153,35 @@ void RewriteActionCompressor::compressReparentIntoSamePropertyActions(QList<Rewr
     }
 }
 
+void RewriteActionCompressor::compressReparentIntoNewPropertyActions(QList<RewriteAction *> &actions) const
+{
+    QList<RewriteAction *> actionsToRemove;
+
+    QList<RewriteAction *> removeActions;
+
+    for (int i = actions.size(); --i >= 0; ) {
+        RewriteAction *action = actions.at(i);
+
+        if (ReparentNodeRewriteAction *reparentAction = action->asReparentNodeRewriteAction()) {
+            if (m_positionStore->nodeOffset(reparentAction->targetProperty().parentModelNode()) < 0) {
+                actionsToRemove.append(action);
+
+                const ModelNode childNode = reparentAction->reparentedNode();
+
+                if (m_positionStore->nodeOffset(childNode) > 0)
+                    removeActions.append(new RemoveNodeRewriteAction(childNode));
+            }
+        }
+    }
+
+    for (RewriteAction *action : qAsConst(actionsToRemove)) {
+        actions.removeOne(action);
+        delete action;
+    }
+
+    actions.append(removeActions);
+}
+
 void RewriteActionCompressor::compressAddEditRemoveNodeActions(QList<RewriteAction *> &actions) const
 {
     QList<RewriteAction *> actionsToRemove;