aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-01-19 12:04:06 +0100
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-01-19 12:04:44 +0000
commit17e5cd708541d10d17a77216e80b8a6c99f1a85a (patch)
treec1e1edc7a8108bb95cccd394b70e7f44f81693aa /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
parent9c77515b211b04a5fe81abb4487c20d8095e253e (diff)
QmlDesigner: Fix crash in qml2puppet
We should not call updateDirtyNode() for items without a window. This will assert later in consistency checks. Change-Id: Iff3574123a1497206de88d59fcf630ead57ef593 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index c215b2c16b..7890f695c8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -581,7 +581,8 @@ void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParen
}
refresh();
- DesignerSupport::updateDirtyNode(quickItem());
+ if (quickItem()->window())
+ DesignerSupport::updateDirtyNode(quickItem());
if (instanceIsValidLayoutable(oldParentInstance, oldParentProperty))
oldParentInstance->refreshLayoutable();