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

QmlDesigner: Fix used imports not being in sync with model content

Browse Source 
Figuring out the used imports checks all model nodes, which means
model needs to be updated before used imports are determined.
Fixed by moving setupUsedImports() call after model sync.

Fixes: QDS-4985
Change-Id: I3f03055d36cb638bcfcd48dc973dbae3af7d8002
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-09-03 12:21:50 +03:00
parent 83e926f1cd
commit 4772253d9d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1099,7 +1099,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
m_rewriterView->setWarnings(warnings); m_rewriterView->setWarnings(warnings);
qCInfo(rewriterBenchmark) << "checked semantic errors:" << time.elapsed(); qCInfo(rewriterBenchmark) << "checked semantic errors:" << time.elapsed();
} }
setupUsedImports();
AST::UiObjectMember *astRootNode = nullptr; AST::UiObjectMember *astRootNode = nullptr;
if (AST::UiProgram *program = m_document->qmlProgram()) if (AST::UiProgram *program = m_document->qmlProgram())
@@ -1111,6 +1110,8 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
qCInfo(rewriterBenchmark) << "synced nodes:" << time.elapsed(); qCInfo(rewriterBenchmark) << "synced nodes:" << time.elapsed();
setupUsedImports();
setActive(false); setActive(false);
return true; return true;