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/qquickgroupbox.cpp | |
| 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/qquickgroupbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickgroupbox.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp index 5a5a8005..dd6d1883 100644 --- a/src/quicktemplates2/qquickgroupbox.cpp +++ b/src/quicktemplates2/qquickgroupbox.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers - \brief A logical group of controls within a titled visual frame. + \brief Visual frame and title for a logical group of controls. GroupBox is used to layout a logical group of controls together, within a \l {title}{titled} visual frame. GroupBox does not provide a layout of its own, but @@ -118,6 +118,7 @@ void QQuickGroupBox::setTitle(const QString &title) return; d->title = title; + setAccessibleName(title); emit titleChanged(); } @@ -152,4 +153,20 @@ QFont QQuickGroupBox::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::GroupBoxTitleFont); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickGroupBox::accessibleRole() const +{ + return QAccessible::Grouping; +} + +void QQuickGroupBox::accessibilityActiveChanged(bool active) +{ + Q_D(QQuickGroupBox); + QQuickFrame::accessibilityActiveChanged(active); + + if (active) + setAccessibleName(d->title); +} +#endif // QT_NO_ACCESSIBILITY + QT_END_NAMESPACE |