From 0ca288f5185fd7c9f876291dcc6a724be9b2d910 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 5 Oct 2016 12:13:42 +0200 Subject: QmlDesigner: fix a crash when there are missing imports Task-number: QTCREATORBUG-16963 Change-Id: I0d4c2e018b4849b2a32cd77da8c2f979fd3befb3 Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp') diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index c84dcc468e..203798e4bf 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -165,8 +165,10 @@ void QuickItemNodeInstance::initialize(const ObjectNodeInstance::Pointer &object quickItem()->setParentItem(qobject_cast(nodeInstanceServer()->quickView()->rootObject())); } - if (s_createEffectItem || instanceId() == 0) - designerSupport()->refFromEffectItem(quickItem()); + if (quickItem()->window()) { + if (s_createEffectItem || instanceId() == 0) + designerSupport()->refFromEffectItem(quickItem()); + } ObjectNodeInstance::initialize(objectNodeInstance); quickItem()->update(); @@ -582,8 +584,7 @@ void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParen if (quickItem()->parentItem()) { refresh(); - if (quickItem()->window()) - DesignerSupport::updateDirtyNode(quickItem()); + DesignerSupport::updateDirtyNode(quickItem()); if (instanceIsValidLayoutable(oldParentInstance, oldParentProperty)) oldParentInstance->refreshLayoutable(); -- cgit v1.2.3