QmlDesigner: Fix crash in property editor when parent of an item is invalid

Happened for

import Qt 4.6
Flipable {
  Rectangle {}
}

1 files changed, 10 insertions, 9 deletions

diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
index 5c677348cf..1309adea5e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
@@ -87,19 +87,20 @@ void SiblingComboBox::setup()
     }
 
     QmlItemNode parent(m_itemNode.instanceParent().toQmlItemNode());
-    m_itemList.prepend(parent);
-    QString parentString("Parent (");
 
-    if (parent.id().isEmpty())
-        parentString += parent.simplfiedTypeName();
-    else
-        parentString += parent.id();
-    parentString += ")";
-    insertItem(0, parentString);
+    if (parent.isValid()) {
+        m_itemList.prepend(parent);
+        QString parentString("Parent (");
 
+        if (parent.id().isEmpty())
+            parentString += parent.simplfiedTypeName();
+        else
+            parentString += parent.id();
+        parentString += ")";
+        insertItem(0, parentString);
+    }
     setCurrentIndex(m_itemList.indexOf(m_selectedItemNode));
     connect(this, SIGNAL(currentIndexChanged (int)), this, SLOT(changeSelection(int)));
-
 }