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

QmlDesigner: Restart puppet asynchronously when imports change

Browse Source 
If imports are changed in transaction, the puppet restart should be
done after the transaction is completed, or the new types won't work
correctly until puppet is reset again.

Task-number: QDS-11811
Change-Id: Ie60945fbe9e7090b7fc27b55e1b6d23d5aa04a55
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-01-30 13:14:15 +02:00
parent 217ff89827
commit 3ec2cd1f0b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -625,7 +625,7 @@ void NodeInstanceView::nodeOrderChanged(const NodeListProperty &listProperty)
void NodeInstanceView::importsChanged(const Imports &/*addedImports*/, const Imports &/*removedImports*/) void NodeInstanceView::importsChanged(const Imports &/*addedImports*/, const Imports &/*removedImports*/)
{ {
restartProcess(); delayedRestartProcess();
} }
void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,

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

@@ -182,11 +182,8 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view,
const QString effectName = QFileInfo(effectPath).baseName(); const QString effectName = QFileInfo(effectPath).baseName();
Import import = Import::createLibraryImport("Effects." + effectName, "1.0"); Import import = Import::createLibraryImport("Effects." + effectName, "1.0");
try { try {
if (!view->model()->hasImport(import, true, true)) { if (!view->model()->hasImport(import, true, true))
view->model()->changeImports({import}, {}); view->model()->changeImports({import}, {});
// Trigger async reset puppet to ensure full transaction is done before reset
view->resetPuppet();
}
} catch (const Exception &) { } catch (const Exception &) {
QTC_ASSERT(false, return); QTC_ASSERT(false, return);
} }