From 50b1bf629e7e4e7c6e6ec1607c82e3de2a40a08d Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@theqtcompany.com>
Date: Tue, 22 Mar 2016 11:52:51 +0100
Subject: [PATCH] QmlDesigner: remove unused code

Change-Id: I00bc1b533f065b87a8d1b46e3296f76bf05b85d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
---
 .../qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index 14c8aff660d..d0f60103ae8 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();
 }