From 9f33f76a9723b615b6176695796dc87f845ba03d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 10 May 2021 14:49:56 +0300 Subject: [PATCH] QmlPuppet: Fix crash when editing importing 3D component Fixes: QDS-4334 Change-Id: I03c79ae7e51d6821823e19d813eba483ec5981c7 Reviewed-by: Mahmoud Badri --- .../qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index a9dc0874138..a669aad6fc9 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -145,7 +145,8 @@ void Qt5NodeInstanceServer::resizeCanvasToRootItem() { #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_viewData.bufferDirty = true; - m_viewData.contentItem->setPosition(-m_viewData.rootItem->position()); + if (m_viewData.contentItem) + m_viewData.contentItem->setPosition(-m_viewData.rootItem->position()); #endif quickWindow()->resize(rootNodeInstance().boundingRect().size().toSize()); }