diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 16:00:13 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 16:00:13 +0100 |
commit | 3f646aca34c25f7cc36df2f988790bb238026422 (patch) | |
tree | 2f8c3022a7b7c1ec15db3ca528a3e7c604a18a63 /src/quicktemplates2/qquickstackview.cpp | |
parent | c4a5b64abacad55e8b805bc1b1eaa877b0c945bb (diff) | |
parent | d59476a0bb93c806c5dfb8bf998b50025ed4f852 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I8c3ccb301730ecdc0acdcb75de607cdd4f753e15
Diffstat (limited to 'src/quicktemplates2/qquickstackview.cpp')
-rw-r--r-- | src/quicktemplates2/qquickstackview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index c4bba4c8..d16d7b16 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -992,6 +992,13 @@ bool QQuickStackView::childMouseEventFilter(QQuickItem *item, QEvent *event) return window && !window->mouseGrabberItem(); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickStackView::accessibleRole() const +{ + return QAccessible::LayeredPane; +} +#endif + void QQuickStackAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent) { Q_Q(QQuickStackAttached); |