diff options
author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-04-04 13:25:09 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-04-04 13:25:09 +0200 |
commit | 3c172a959d9e42a617bc1fc25193b5b15de39516 (patch) | |
tree | f16cce24f95b98c57501dddb4b7ab21459f550c8 /src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp | |
parent | 5f27ad85ea4e4662df524cd8223aa4c4c3613348 (diff) | |
download | qt-creator-3c172a959d9e42a617bc1fc25193b5b15de39516.tar.gz |
QmlDesigner.rewriter: fix for compression
AddProperty also sets a value.
RemoveProperty and then AddProperty cannot be compressed like this.
Reviewed-by: Kai Koehne
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index bb93d63e69..45cab4f498 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -236,9 +236,6 @@ void RewriteActionCompressor::compressPropertyActions(QList<RewriteAction *> &ac if (RemovePropertyRewriteAction *removeAction = action->asRemovePropertyRewriteAction()) { const AbstractProperty property = removeAction->property(); if (AddPropertyRewriteAction *addAction = addedProperties.value(property, 0)) { - actionsToRemove.append(addAction); - actionsToRemove.append(removeAction); - addedProperties.remove(property); } else { removedProperties.insert(property, action); } |