From 17e5cd708541d10d17a77216e80b8a6c99f1a85a Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 19 Jan 2016 12:04:06 +0100
Subject: [PATCH] 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>
---
 .../qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index c215b2c16b0..7890f695c85 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();