QmlDesigner.FormEditor: Test if a qml item is valid to prevent crashes

1 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
index 342bc7ee5d..14058de2ac 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
@@ -128,12 +128,15 @@ AbstractFormEditorTool* FormEditorScene::currentTool() const
 //This method calculates the possible parent for reparent
 FormEditorItem* FormEditorScene::calulateNewParent(FormEditorItem *formEditorItem)
 {
-    QList<QGraphicsItem *> list = items(formEditorItem->qmlItemNode().instanceBoundingRect().center());
-    foreach (QGraphicsItem *graphicsItem, list) {
-        if (qgraphicsitem_cast<FormEditorItem*>(graphicsItem) &&
-            graphicsItem->collidesWithItem(formEditorItem, Qt::ContainsItemShape))
-            return qgraphicsitem_cast<FormEditorItem*>(graphicsItem);
+    if (formEditorItem->qmlItemNode().isValid()) {
+        QList<QGraphicsItem *> list = items(formEditorItem->qmlItemNode().instanceBoundingRect().center());
+        foreach (QGraphicsItem *graphicsItem, list) {
+            if (qgraphicsitem_cast<FormEditorItem*>(graphicsItem) &&
+                graphicsItem->collidesWithItem(formEditorItem, Qt::ContainsItemShape))
+                return qgraphicsitem_cast<FormEditorItem*>(graphicsItem);
+        }
     }
+
     return 0;
 }