From 4772253d9d37ba35adec26349aa43931d277afcc Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 3 Sep 2021 12:21:50 +0300 Subject: [PATCH] QmlDesigner: Fix used imports not being in sync with model content 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 --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 67ec00e1212..0209c7a0a7e 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -1099,7 +1099,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH m_rewriterView->setWarnings(warnings); qCInfo(rewriterBenchmark) << "checked semantic errors:" << time.elapsed(); } - setupUsedImports(); AST::UiObjectMember *astRootNode = nullptr; 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(); + setupUsedImports(); + setActive(false); return true;