feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: remove unused code

Browse Source 
Change-Id: I00bc1b533f065b87a8d1b46e3296f76bf05b85d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-03-22 11:52:51 +01:00
parent 8a7349dc6b
commit 50b1bf629e
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -814,14 +814,8 @@ QObject *ObjectNodeInstance::parent() const
QObject *ObjectNodeInstance::parentObject(QObject *object) QObject *ObjectNodeInstance::parentObject(QObject *object)
{ {
QQuickItem *quickItem = qobject_cast<QQuickItem*>(object); QQuickItem *quickItem = qobject_cast<QQuickItem*>(object);
if (quickItem && quickItem->parentItem()) { if (quickItem && quickItem->parentItem())
//QQuickRootItem is used by Window and we want to return the Window as parent
if (strcmp(quickItem->metaObject()->className(), "QQuickRootItem"))
return object->parent();
return quickItem->parentItem(); return quickItem->parentItem();
}
return object->parent(); return object->parent();
} }