diff options
| author | David Schulz <david.schulz@qt.io> | 2021-05-06 12:21:08 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2021-05-26 04:39:58 +0000 |
| commit | 39921ce7bd7ebecaefceaf00428c90c25d69f603 (patch) | |
| tree | 82b2be93f26f2c0dd68e689ffafecfe0cb423d88 /src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp | |
| parent | c17c805e43f6760328cc6225c9319738c1dbb361 (diff) | |
| download | qt-creator-39921ce7bd7ebecaefceaf00428c90c25d69f603.tar.gz | |
Designer: take tab settings into account when generating qml code
Task-number: QTCREATORBUG-24523
Change-Id: I1e02c781fbbde8114dd4570460756ce796275379
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index d84b088db8..24342002b3 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -50,14 +50,15 @@ static bool nodeOrParentInSet(const ModelNode &modelNode, const QSet<ModelNode> return false; } -void RewriteActionCompressor::operator()(QList<RewriteAction *> &actions) const +void RewriteActionCompressor::operator()(QList<RewriteAction *> &actions, + const TextEditor::TabSettings &tabSettings) const { compressImports(actions); compressRereparentActions(actions); compressReparentIntoSamePropertyActions(actions); compressPropertyActions(actions); compressAddEditRemoveNodeActions(actions); - compressAddEditActions(actions); + compressAddEditActions(actions, tabSettings); compressAddReparentActions(actions); } @@ -256,7 +257,8 @@ void RewriteActionCompressor::compressPropertyActions(QList<RewriteAction *> &ac } } -void RewriteActionCompressor::compressAddEditActions(QList<RewriteAction *> &actions) const +void RewriteActionCompressor::compressAddEditActions( + QList<RewriteAction *> &actions, const TextEditor::TabSettings &tabSettings) const { QList<RewriteAction *> actionsToRemove; QSet<ModelNode> addedNodes; @@ -303,7 +305,7 @@ void RewriteActionCompressor::compressAddEditActions(QList<RewriteAction *> &act delete action; } - QmlTextGenerator gen(m_propertyOrder); + QmlTextGenerator gen(m_propertyOrder, tabSettings); foreach (RewriteAction *action, dirtyActions) { RewriteAction *newAction = nullptr; if (AddPropertyRewriteAction *addAction = action->asAddPropertyRewriteAction()) { |