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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Change-Id: I3f28f1f53cf2b2228928fbd7accf25d87bb40243
This commit is contained in:
Eike Ziller
2016-03-23 14:15:26 +01:00
parent 61411f9415 50b1bf629e
commit 467def6996
33 changed files with 218 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+1 -7
View File
@@ -814,14 +814,8 @@ QObject *ObjectNodeInstance::parent() const
QObject *ObjectNodeInstance::parentObject(QObject *object)
{
QQuickItem *quickItem = qobject_cast<QQuickItem*>(object);
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();
if (quickItem && quickItem->parentItem())
return quickItem->parentItem();
}
return object->parent();
}