Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs

Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index 1cb24064f1..4f6ee51c5d 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -128,7 +128,7 @@ QQuickViewInspector::QQuickViewInspector(QQuickView *view, QObject *parent) :
     // Try to make sure the overlay is always on top
     m_overlay->setZ(FLT_MAX);
 
-    if (QQuickItem *root = view->rootItem())
+    if (QQuickItem *root = view->contentItem())
         m_overlay->setParentItem(root);
 
     view->installEventFilter(this);
@@ -190,13 +190,13 @@ QQmlEngine *QQuickViewInspector::declarativeEngine() const
 
 QQuickItem *QQuickViewInspector::topVisibleItemAt(const QPointF &pos) const
 {
-    QQuickItem *root = m_view->rootItem();
+    QQuickItem *root = m_view->contentItem();
     return itemAt(root, root->mapFromScene(pos), m_overlay);
 }
 
 QList<QQuickItem *> QQuickViewInspector::itemsAt(const QPointF &pos) const
 {
-    QQuickItem *root = m_view->rootItem();
+    QQuickItem *root = m_view->contentItem();
     QList<QQuickItem *> resultList;
     collectItemsAt(root, root->mapFromScene(pos), m_overlay,
                    resultList);