diff options
author | Marco Bubke <marco.bubke@qt.io> | 2020-09-03 13:48:13 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-09-11 08:57:42 +0000 |
commit | 0f9010d381d9defb7597f28186b9e10d3dd3eae1 (patch) | |
tree | 437e2d0e8774736804bb3fe37f1bc2995ffd1622 /src/plugins/qmldesigner/designercore | |
parent | a535196c418a7054c2fb1524ff1df9afb0961166 (diff) |
QmlDesigner: Introduce multiple node instance server
For capturing data we need a atomic mechanism. So in one
process multiple node instance server can be started and
then a command is send back that a scene is created. It
can be used to ensure that captured data of views is
up to date.
Task-number: QDS-2630
Change-Id: Iea8d0b036b6384c9c1b0f91af401f2b1f1978c12
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
-rw-r--r-- | src/plugins/qmldesigner/designercore/include/nodeinstanceview.h | 1 | ||||
-rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 7ab1fc9808..eaf4fc08e2 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -99,6 +99,7 @@ public: void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; void capturedData(const CapturedDataCommand &capturedData) override; void currentStateChanged(const ModelNode &node) override; + void sceneCreated(const SceneCreatedCommand &command) override; QList<NodeInstance> instances() const; NodeInstance instanceForModelNode(const ModelNode &node) const ; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index ece4fa35b9..dc379bd312 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -64,6 +64,7 @@ #include "removepropertiescommand.h" #include "removesharedmemorycommand.h" #include "reparentinstancescommand.h" +#include "scenecreatedcommand.h" #include "statepreviewimagechangedcommand.h" #include "tokencommand.h" #include "update3dviewstatecommand.h" @@ -585,10 +586,10 @@ void NodeInstanceView::currentStateChanged(const ModelNode &node) nodeInstanceView()->activateBaseState(); } +void NodeInstanceView::sceneCreated(const SceneCreatedCommand &) {} //\} - void NodeInstanceView::removeAllInstanceNodeRelationships() { m_nodeInstanceHash.clear(); |