aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2016-10-05 12:13:42 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-10-05 14:14:11 +0000
commit0ca288f5185fd7c9f876291dcc6a724be9b2d910 (patch)
tree9d6ccce87b0525f09aea08faf5e16f99a1d53d3d /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
parent90cf4487a52cbff8389be85b8926afba24d75918 (diff)
QmlDesigner: fix a crash when there are missing imports
Task-number: QTCREATORBUG-16963 Change-Id: I0d4c2e018b4849b2a32cd77da8c2f979fd3befb3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp9
1 files changed, 5 insertions, 4 deletions
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<QQuickItem*>(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();