diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp index 5c677348cf478f95954ee0f960f9d044c782f38c..1309adea5e271b7b82b5f224ce47d41fc10206f6 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))); - } diff --git a/tests/manual/qml/testfiles/flipable.qml b/tests/manual/qml/testfiles/flipable.qml new file mode 100644 index 0000000000000000000000000000000000000000..16af9d7827dec12e4e7e31dd6ca155fcb9008837 --- /dev/null +++ b/tests/manual/qml/testfiles/flipable.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Rectangle { + width: 640 + height: 480 +}