diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-10-08 10:50:15 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-10-20 14:55:43 +0000 |
commit | 6b8d8e414ac45ed74fd3968da9525c704178eae8 (patch) | |
tree | 87bb5bf65d562eccddc2aeeb5f85d3583f730694 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h | |
parent | 49a8266d5869d221b16066378ad89ff7cb105e70 (diff) |
QmlDesigner: Port 3D edit view to Qt6
Task-number: QDS-2899
Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h index 881e676915..8f3af1ccdb 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h @@ -49,6 +49,7 @@ class Qt5InformationNodeInstanceServer : public Qt5NodeInstanceServer public: explicit Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient); + ~Qt5InformationNodeInstanceServer() override; void reparentInstances(const ReparentInstancesCommand &command) override; void clearScene(const ClearSceneCommand &command) override; @@ -89,6 +90,7 @@ protected: void selectInstances(const QList<ServerNodeInstance> &instanceList); void modifyProperties(const QVector<InstancePropertyValueTriple> &properties); QList<ServerNodeInstance> createInstances(const QVector<InstanceContainer> &container) override; + void initializeAuxiliaryViews() override; private: void handleObjectPropertyChangeTimeout(); @@ -129,6 +131,7 @@ private: QPointer<QQuickView> m_editView3D; QQuickItem *m_editView3DRootItem = nullptr; QQuickItem *m_editView3DContentItem = nullptr; + bool m_editView3DSetupDone = false; QPointer<QQuickView> m_ModelNode3DImageView; QQuickItem *m_ModelNode3DImageViewRootItem = nullptr; QQuickItem *m_ModelNode3DImageViewContentItem = nullptr; |