Merge branch 'master' into v8-clean

Conflicts:
	src/declarative/qml/qdeclarativevme.cpp

Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f

1 files changed, 3 insertions, 4 deletions

diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp
index e3da1bd8dc..53bebe00ba 100644
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qsgitem.cpp
@@ -1926,13 +1926,12 @@ QSGItem *QSGItem::childAt(qreal x, qreal y) const
     // XXX todo - should this include transform etc.?
     const QList<QSGItem *> children = childItems();
     for (int i = children.count()-1; i >= 0; --i) {
-        if (QSGItem *child = qobject_cast<QSGItem *>(children.at(i))) {
-            if (child->isVisible() && child->x() <= x
+        QSGItem *child = children.at(i);
+        if (child->isVisible() && child->x() <= x
                 && child->x() + child->width() >= x
                 && child->y() <= y
                 && child->y() + child->height() >= y)
-                return child;
-        }
+            return child;
     }
     return 0;
 }