diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 18:20:15 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 19:20:42 +0100 |
commit | 6c88fe58a6037d252f40bf00aa5052b0f724a862 (patch) | |
tree | 9afdf0b638bc89e5e71eeac7b3c06ed53831e45b /src/quicktemplates2/qquickstackview_p.h | |
parent | 83cbe4e899d2d22e923bdc10e90f91ef106edf58 (diff) | |
parent | 3f646aca34c25f7cc36df2f988790bb238026422 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/BusyIndicator.qml
src/imports/controls/ProgressBar.qml
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickstackview.cpp
Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p.h')
-rw-r--r-- | src/quicktemplates2/qquickstackview_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h index e14bf2d4..8709e4a4 100644 --- a/src/quicktemplates2/qquickstackview_p.h +++ b/src/quicktemplates2/qquickstackview_p.h @@ -153,6 +153,10 @@ protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; bool childMouseEventFilter(QQuickItem *, QEvent *) override; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const override; +#endif + private: Q_DISABLE_COPY(QQuickStackView) Q_DECLARE_PRIVATE(QQuickStackView) |