diff options
| author | Alan Alpert <[email protected]> | 2012-08-07 11:26:37 +1000 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2012-10-16 07:24:06 +0200 |
| commit | f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 (patch) | |
| tree | 6eabf1ad37e12247f210e3fe77f64abf6255aa56 /src/plugins/accessible/quick | |
| parent | cc39a7d7affe37741292989c634aec3f60660c0e (diff) | |
Remove interim compatibility measures
Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <[email protected]>
Diffstat (limited to 'src/plugins/accessible/quick')
| -rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp index d7f2b943c3..764db834d2 100644 --- a/src/plugins/accessible/quick/qaccessiblequickview.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp @@ -60,7 +60,7 @@ QAccessibleQuickView::QAccessibleQuickView(QQuickView *object) int QAccessibleQuickView::childCount() const { - return view()->rootItem() ? 1 : 0; + return view()->contentItem() ? 1 : 0; } QAccessibleInterface *QAccessibleQuickView::parent() const @@ -155,7 +155,7 @@ static QQuickItem *childAt_helper(QQuickItem *item, int x, int y) QAccessibleInterface *QAccessibleQuickView::childAt(int x, int y) const { Q_ASSERT(view()); - QQuickItem *root = view()->rootItem(); + QQuickItem *root = view()->contentItem(); if (root) { if (QQuickItem *item = childAt_helper(root, x, y)) return QAccessible::queryAccessibleInterface(item); |