diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
| commit | 5169a1ecd03eaea95ab07aeefc8d76cca7530563 (patch) | |
| tree | 2666aecdf5a9c90d9b68dd7df8c6b5d1507541a6 /src/quicktemplates2/qquickpage.cpp | |
| parent | 7decf1ee51df6c772b84ba8bed2f1e3d0e344908 (diff) | |
| parent | 814601e9cdf5895152cedcd1968fd2a4eecd3cd3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/Drawer.qml
src/imports/controls/Frame.qml
src/imports/controls/GroupBox.qml
src/imports/controls/Page.qml
src/imports/controls/Pane.qml
src/imports/controls/ToolBar.qml
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickpopup.cpp
tests/auto/accessibility/data/busyindicator.qml
tests/auto/accessibility/data/button.qml
tests/auto/accessibility/data/checkbox.qml
tests/auto/accessibility/data/control.qml
tests/auto/accessibility/data/dial.qml
tests/auto/accessibility/data/label.qml
tests/auto/accessibility/data/menu.qml
tests/auto/accessibility/data/pageindicator.qml
tests/auto/accessibility/data/popup.qml
tests/auto/accessibility/data/progressbar.qml
tests/auto/accessibility/data/radiobutton.qml
tests/auto/accessibility/data/rangeslider.qml
tests/auto/accessibility/data/scrollbar.qml
tests/auto/accessibility/data/scrollindicator.qml
tests/auto/accessibility/data/slider.qml
tests/auto/accessibility/data/spinbox.qml
tests/auto/accessibility/data/switch.qml
tests/auto/accessibility/data/tabbar.qml
tests/auto/accessibility/data/tabbutton.qml
tests/auto/accessibility/data/textarea.qml
tests/auto/accessibility/data/textfield.qml
tests/auto/accessibility/data/toolbar.qml
tests/auto/accessibility/data/toolbutton.qml
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
Diffstat (limited to 'src/quicktemplates2/qquickpage.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpage.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 432c8c63..ad1e4ebd 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers - \brief A control that makes it convenient to add a header and footer to a page. + \brief Styled page control with support for a header and footer. Page is a container control which makes it convenient to add a \l header and \l footer item to a page. @@ -169,6 +169,7 @@ void QQuickPage::setTitle(const QString &title) return; d->title = title; + setAccessibleName(title); emit titleChanged(); } @@ -361,6 +362,15 @@ QAccessible::Role QQuickPage::accessibleRole() const { return QAccessible::PageTab; } + +void QQuickPage::accessibilityActiveChanged(bool active) +{ + Q_D(QQuickPage); + QQuickControl::accessibilityActiveChanged(active); + + if (active) + setAccessibleName(d->title); +} #endif QT_END_NAMESPACE |