diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:04:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 20:41:34 +0200 |
| commit | 63ec33e79cf86c4312c58bea12a2aab400890c70 (patch) | |
| tree | 5c9b5cd51276ea0a3ca42567666a09e70efa11cc /src/quick/accessible | |
| parent | b9e4a4df577959579b2322fb6077bde82d9ffce3 (diff) | |
| parent | afc84775efdc6e13e2e210bb94e115b378d90134 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
Change-Id: I89ffccd699bee675732758d039e22224b275d60d
Diffstat (limited to 'src/quick/accessible')
| -rw-r--r-- | src/quick/accessible/qaccessiblequickitem.cpp | 5 | ||||
| -rw-r--r-- | src/quick/accessible/qaccessiblequickitem_p.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp index 932f7663c3..a56d098717 100644 --- a/src/quick/accessible/qaccessiblequickitem.cpp +++ b/src/quick/accessible/qaccessiblequickitem.cpp @@ -54,6 +54,11 @@ QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item) { } +QWindow *QAccessibleQuickItem::window() const +{ + return item()->window(); +} + int QAccessibleQuickItem::childCount() const { return childItems().count(); diff --git a/src/quick/accessible/qaccessiblequickitem_p.h b/src/quick/accessible/qaccessiblequickitem_p.h index d6792b0850..8541734d39 100644 --- a/src/quick/accessible/qaccessiblequickitem_p.h +++ b/src/quick/accessible/qaccessiblequickitem_p.h @@ -66,6 +66,8 @@ class QAccessibleQuickItem : public QAccessibleObject, public QAccessibleActionI public: QAccessibleQuickItem(QQuickItem *item); + QWindow *window() const Q_DECL_OVERRIDE; + QRect rect() const; QRect viewRect() const; |