diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 15:20:41 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-29 06:55:02 +0000 |
| commit | 361a9929a7bfc09d1497923a27be5606b9138dd7 (patch) | |
| tree | 6d844ac2da2720f81ea844526b813f71aa792a2c /src/templates/qquickcontrol.cpp | |
| parent | dac9c3f46650ef69a32f09280f3e78f9bba0f77b (diff) | |
Added QQuickControl::accessibleRole() and etc
* m_accessibleRole was removed
* also applied to QQuickLabel, QQuickTextArea and QQuickTextField
Change-Id: I4b487f32cccfba0e16b3dba7e39882e8cd7ea616
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol.cpp')
| -rw-r--r-- | src/templates/qquickcontrol.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index 966e63a3..c8b5287b 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -65,7 +65,7 @@ QQuickControlPrivate::QQuickControlPrivate() : hasTopPadding(false), hasLeftPadding(false), hasRightPadding(false), hasBottomPadding(false), padding(0), topPadding(0), leftPadding(0), rightPadding(0), bottomPadding(0), spacing(0), layoutDirection(Qt::LeftToRight), background(Q_NULLPTR), contentItem(Q_NULLPTR), - accessibleAttached(Q_NULLPTR), m_accessibleRole(0) // QAccessible::NoRole + accessibleAttached(Q_NULLPTR) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); @@ -175,7 +175,13 @@ void QQuickControlPrivate::accessibilityActiveChanged(bool active) QAccessible::Role QQuickControlPrivate::accessibleRole() const { - return (QAccessible::Role)m_accessibleRole; + Q_Q(const QQuickControl); + return q->accessibleRole(); +} + +QAccessible::Role QQuickControl::accessibleRole() const +{ + return QAccessible::NoRole; } void QQuickControl::accessibilityActiveChanged(bool active) @@ -186,7 +192,7 @@ void QQuickControl::accessibilityActiveChanged(bool active) d->accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(this, true)); if (d->accessibleAttached) - d->accessibleAttached->setRole((QAccessible::Role)(d->m_accessibleRole)); + d->accessibleAttached->setRole(accessibleRole()); else qWarning() << "QQuickControl: " << this << " QQuickAccessibleAttached object creation failed!"; } @@ -262,22 +268,6 @@ void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &f) } } -int QQuickControl::accessibleRole() const -{ - Q_D(const QQuickControl); - return d->m_accessibleRole; -} - -void QQuickControl::setAccessibleRole(int role) -{ - Q_D(QQuickControl); - d->m_accessibleRole = role; -#ifndef QT_NO_ACCESSIBILITY - if (d->accessibleAttached) - d->accessibleAttached->setRole((QAccessible::Role)role); -#endif -} - QString QQuickControl::accessibleName() const { #ifndef QT_NO_ACCESSIBILITY |