diff options
| author | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-03-22 11:52:51 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-03-23 12:13:48 +0000 |
| commit | 50b1bf629e7e4e7c6e6ec1607c82e3de2a40a08d (patch) | |
| tree | 99a7a5b89e1474696e8d411d4ae5c0b087120257 /share | |
| parent | 8a7349dc6b04d17eebeac756a34543a6125e896d (diff) | |
| download | qt-creator-50b1bf629e7e4e7c6e6ec1607c82e3de2a40a08d.tar.gz | |
QmlDesigner: remove unused code
Change-Id: I00bc1b533f065b87a8d1b46e3296f76bf05b85d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 14c8aff660..d0f60103ae 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -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(); } |