feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Only restore auxiliary data the first time

Browse Source 
Since we only save auxiliary data when the document is saved,
we would otherwise override removed auxiliary data.

Task-number: QDS-3075
Change-Id: I22c6ea6be1ecda4b0323a58d8ce3e8963c194266
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2020-11-05 14:32:26 +01:00
parent b48fc5ae4f
commit 938d9d919b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -1130,6 +1130,10 @@ void RewriterView::restoreAuxiliaryData()
{ {
QTC_ASSERT(m_textModifier, return); QTC_ASSERT(m_textModifier, return);
const char auxRestoredFlag[] = "AuxRestored@Internal";
if (rootModelNode().hasAuxiliaryData(auxRestoredFlag))
return;
m_restoringAuxData = true; m_restoringAuxData = true;
setupCanonicalHashes(); setupCanonicalHashes();
@@ -1149,6 +1153,7 @@ void RewriterView::restoreAuxiliaryData()
checkChildNodes(reader.readFromSource(auxSource), this); checkChildNodes(reader.readFromSource(auxSource), this);
} }
rootModelNode().setAuxiliaryData(auxRestoredFlag, true);
m_restoringAuxData = false; m_restoringAuxData = false;
} }