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/tools | |
| parent | a535196c418a7054c2fb1524ff1df9afb0961166 (diff) | |
| download | qt-creator-0f9010d381d9defb7597f28186b9e10d3dd3eae1.tar.gz | |
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/tools')
| -rw-r--r-- | src/tools/qml2puppet/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 2b80c8ca29..f3f6a66303 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -53,6 +53,7 @@ extend_qtc_executable(qml2puppet view3dactioncommand.cpp view3dactioncommand.h valueschangedcommand.cpp captureddatacommand.h + scenecreatedcommand.h ) extend_qtc_executable(qml2puppet @@ -156,7 +157,9 @@ extend_qtc_executable(qml2puppet quick3dtexturenodeinstance.cpp quick3dtexturenodeinstance.h quickitemnodeinstance.cpp quickitemnodeinstance.h servernodeinstance.cpp servernodeinstance.h - qt5capturenodeinstanceserver.cpp qt5capturenodeinstanceserver.h + qt5capturepreviewnodeinstanceserver.cpp qt5capturepreviewnodeinstanceserver.h + nodeinstanceserverdispatcher.cpp nodeinstanceserverdispatcher.h + capturenodeinstanceserverdispatcher.cpp capturenodeinstanceserverdispatcher.h ) extend_qtc_executable(qml2puppet diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 3aab61eb9c..4d135b0cde 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -117,6 +117,7 @@ QtcTool { "commands/view3dactioncommand.cpp", "commands/view3dactioncommand.h", "commands/captureddatacommand.h", + "commands/scenecreatedcommand.h", "container/addimportcontainer.cpp", "container/addimportcontainer.h", "container/idcontainer.cpp", @@ -219,8 +220,12 @@ QtcTool { "instances/qt5testnodeinstanceserver.h", "instances/servernodeinstance.cpp", "instances/servernodeinstance.h", - "instances/qt5capturenodeinstanceserver.cpp", - "instances/qt5capturenodeinstanceserver.h", + "instances/qt5capturepreviewnodeinstanceserver.cpp", + "instances/qt5capturepreviewnodeinstanceserver.h", + "instances/nodeinstanceserverdispatcher.cpp", + "instances/nodeinstanceserverdispatcher.h", + "instances/capturenodeinstanceserverdispatcher.cpp", + "instances/capturenodeinstanceserverdispatcher.h", "editor3d/generalhelper.cpp", "editor3d/mousearea3d.cpp", "editor3d/camerageometry.cpp", |