diff options
Diffstat (limited to 'src/templates')
39 files changed, 168 insertions, 52 deletions
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 44e1189e..df5822fa 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -98,7 +98,6 @@ QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() : pressed(false), checked(false), checkable(false), exclusive(false), label(Q_NULLPTR), indicator(Q_NULLPTR) { - m_accessibleRole = 0x0000002B; // QAccessible::Button } QQuickAbstractButton::QQuickAbstractButton(QQuickItem *parent) : @@ -395,6 +394,11 @@ void QQuickAbstractButton::accessibilityActiveChanged(bool active) setAccessibleProperty("checkable", d->checkable); } } + +QAccessible::Role QQuickAbstractButton::accessibleRole() const +{ + return QAccessible::Button; +} #endif QT_END_NAMESPACE diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index b5a1b660..ea1eacc8 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -122,6 +122,7 @@ protected: #ifndef QT_NO_ACCESSIBILITY void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; #endif private: diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp index 3bfedf6b..e7238ced 100644 --- a/src/templates/qquickbusyindicator.cpp +++ b/src/templates/qquickbusyindicator.cpp @@ -69,7 +69,6 @@ public: QQuickBusyIndicatorPrivate() : running(true), indicator(Q_NULLPTR) { - m_accessibleRole = 0x00000027; //QAccessible::Indicator } bool running; @@ -130,4 +129,11 @@ void QQuickBusyIndicator::setIndicator(QQuickItem *indicator) } } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickBusyIndicator::accessibleRole() const +{ + return QAccessible::Indicator; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h index 8b6446da..79fd5f74 100644 --- a/src/templates/qquickbusyindicator_p.h +++ b/src/templates/qquickbusyindicator_p.h @@ -73,6 +73,11 @@ Q_SIGNALS: void runningChanged(); void indicatorChanged(); +protected: +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickBusyIndicator) Q_DECLARE_PRIVATE(QQuickBusyIndicator) diff --git a/src/templates/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp index 8dd43241..5cef0c47 100644 --- a/src/templates/qquickcheckbox.cpp +++ b/src/templates/qquickcheckbox.cpp @@ -89,7 +89,6 @@ public: QQuickCheckBoxPrivate() : tristate(false), checkState(Qt::Unchecked) { - m_accessibleRole = 0x0000002C; // QAccessible::CheckBox } bool tristate; @@ -171,4 +170,11 @@ void QQuickCheckBox::nextCheckState() QQuickAbstractButton::nextCheckState(); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickCheckBox::accessibleRole() const +{ + return QAccessible::CheckBox; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h index b2f98e92..f347ef82 100644 --- a/src/templates/qquickcheckbox_p.h +++ b/src/templates/qquickcheckbox_p.h @@ -77,6 +77,10 @@ protected: void checkStateSet() Q_DECL_OVERRIDE; void nextCheckState() Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickCheckBox) Q_DECLARE_PRIVATE(QQuickCheckBox) 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 diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 675ec79e..d5024bae 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -151,12 +151,10 @@ protected: #ifndef QT_NO_ACCESSIBILITY virtual void accessibilityActiveChanged(bool active); + virtual QAccessible::Role accessibleRole() const; #endif // helper functions which avoid to check QT_NO_ACCESSIBILITY - int accessibleRole() const; // int for QAccessible::Role - void setAccessibleRole(int role); // int for QAccessible::Role - QString accessibleName() const; void setAccessibleName(const QString &name); diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index ceabc130..126eab60 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -114,7 +114,6 @@ public: QQuickItem *background; QQuickItem *contentItem; QQuickAccessibleAttached *accessibleAttached; - int m_accessibleRole; }; Q_DECLARE_TYPEINFO(QQuickControlPrivate, Q_COMPLEX_TYPE); diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index 65f653f9..bb3b5250 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -92,7 +92,6 @@ public: snapMode(QQuickDial::NoSnap), handle(Q_NULLPTR) { - m_accessibleRole = 0x00000031; // QAccessible::Dial } qreal valueAt(qreal position) const; @@ -533,6 +532,11 @@ void QQuickDial::accessibilityActiveChanged(bool active) if (active) setAccessibleProperty("pressed", d->pressed); } + +QAccessible::Role QQuickDial::accessibleRole() const +{ + return QAccessible::Dial; +} #endif QT_END_NAMESPACE diff --git a/src/templates/qquickdial_p.h b/src/templates/qquickdial_p.h index bffb602c..c4e7c276 100644 --- a/src/templates/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -132,6 +132,7 @@ protected: #ifndef QT_NO_ACCESSIBILITY void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; #endif private: diff --git a/src/templates/qquicklabel.cpp b/src/templates/qquicklabel.cpp index f344a022..2b4b9a12 100644 --- a/src/templates/qquicklabel.cpp +++ b/src/templates/qquicklabel.cpp @@ -82,7 +82,6 @@ QQuickLabel::~QQuickLabel() QQuickLabelPrivate::QQuickLabelPrivate() : background(Q_NULLPTR), accessibleAttached(Q_NULLPTR) - , m_accessibleRole(0x00000029) // Accessible.StaticText { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); @@ -136,7 +135,7 @@ void QQuickLabelPrivate::accessibilityActiveChanged(bool active) Q_Q(QQuickLabel); accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true)); if (accessibleAttached) { - accessibleAttached->setRole((QAccessible::Role)m_accessibleRole); + accessibleAttached->setRole(accessibleRole()); accessibleAttached->setName(text); } else { qWarning() << "QQuickLabel: " << q << " QQuickAccessibleAttached object creation failed!"; @@ -145,7 +144,7 @@ void QQuickLabelPrivate::accessibilityActiveChanged(bool active) QAccessible::Role QQuickLabelPrivate::accessibleRole() const { - return QAccessible::Role(m_accessibleRole); + return QAccessible::StaticText; } #endif diff --git a/src/templates/qquicklabel_p_p.h b/src/templates/qquicklabel_p_p.h index c2a064fe..1cd831b1 100644 --- a/src/templates/qquicklabel_p_p.h +++ b/src/templates/qquicklabel_p_p.h @@ -79,12 +79,11 @@ public: #ifndef QT_NO_ACCESSIBILITY void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - virtual QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; #endif QQuickItem *background; QQuickAccessibleAttached *accessibleAttached; - int m_accessibleRole; }; Q_DECLARE_TYPEINFO(QQuickLabelPrivate, Q_COMPLEX_TYPE); diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index bf8dbc3a..c8518b6f 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -68,7 +68,6 @@ public: QQuickPageIndicatorPrivate() : count(0), currentIndex(0), interactive(false), delegate(Q_NULLPTR), pressedItem(Q_NULLPTR) { - m_accessibleRole = 0x00000027; //QAccessible::Indicator } QQuickItem *itemAt(const QPoint &pos) const; @@ -287,4 +286,11 @@ void QQuickPageIndicator::mouseUngrabEvent() d->updatePressed(false); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickPageIndicator::accessibleRole() const +{ + return QAccessible::Indicator; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h index 8ddc1274..bb0bdf3c 100644 --- a/src/templates/qquickpageindicator_p.h +++ b/src/templates/qquickpageindicator_p.h @@ -98,6 +98,10 @@ protected: void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseUngrabEvent() Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickPageIndicator) Q_DECLARE_PRIVATE(QQuickPageIndicator) diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index c05962ba..f1a4c00f 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -70,7 +70,6 @@ class QQuickProgressBarPrivate : public QQuickControlPrivate public: QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false), indicator(Q_NULLPTR) { - m_accessibleRole = 0x00000030; //QAccessible::ProgressBar } qreal from; @@ -263,4 +262,11 @@ void QQuickProgressBar::componentComplete() setValue(d->value); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickProgressBar::accessibleRole() const +{ + return QAccessible::ProgressBar; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h index 03b2d6a1..f311e1c6 100644 --- a/src/templates/qquickprogressbar_p.h +++ b/src/templates/qquickprogressbar_p.h @@ -99,6 +99,10 @@ protected: void mirrorChange() Q_DECL_OVERRIDE; void componentComplete() Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickProgressBar) Q_DECLARE_PRIVATE(QQuickProgressBar) diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp index a1d1ec25..7a94248a 100644 --- a/src/templates/qquickradiobutton.cpp +++ b/src/templates/qquickradiobutton.cpp @@ -88,7 +88,13 @@ QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) : { setCheckable(true); setExclusive(true); - setAccessibleRole(0x0000002D); //QAccessible::RadioButton } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickRadioButton::accessibleRole() const +{ + return QAccessible::RadioButton; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h index ed55c0f6..87ac919b 100644 --- a/src/templates/qquickradiobutton_p.h +++ b/src/templates/qquickradiobutton_p.h @@ -58,6 +58,11 @@ class Q_LABSTEMPLATES_EXPORT QQuickRadioButton : public QQuickAbstractButton public: explicit QQuickRadioButton(QQuickItem *parent = Q_NULLPTR); + +protected: +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif }; Q_DECLARE_TYPEINFO(QQuickRadioButton, Q_COMPLEX_TYPE); diff --git a/src/templates/qquickrangeslider.cpp b/src/templates/qquickrangeslider.cpp index 17654fc4..2d0806e2 100644 --- a/src/templates/qquickrangeslider.cpp +++ b/src/templates/qquickrangeslider.cpp @@ -301,7 +301,6 @@ public: snapMode(QQuickRangeSlider::NoSnap), track(Q_NULLPTR) { - m_accessibleRole = 0x00000033; //QAccessible::Slider } qreal from; @@ -885,4 +884,12 @@ void QQuickRangeSlider::componentComplete() \sa second */ + +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickRangeSlider::accessibleRole() const +{ + return QAccessible::Slider; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickrangeslider_p.h b/src/templates/qquickrangeslider_p.h index 2761813a..3bd46624 100644 --- a/src/templates/qquickrangeslider_p.h +++ b/src/templates/qquickrangeslider_p.h @@ -118,6 +118,10 @@ protected: void mirrorChange() Q_DECL_OVERRIDE; void componentComplete() Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: friend class QQuickRangeSliderNode; diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index cb3e2766..a2c399c3 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -83,7 +83,6 @@ public: active(false), pressed(false), moving(false), orientation(Qt::Vertical), handle(Q_NULLPTR) { - m_accessibleRole = 0x00000003; // QAccessible::ScrollBar } static QQuickScrollBarPrivate *get(QQuickScrollBar *bar) @@ -298,6 +297,11 @@ void QQuickScrollBar::accessibilityActiveChanged(bool active) if (active) setAccessibleProperty("pressed", d->pressed); } + +QAccessible::Role QQuickScrollBar::accessibleRole() const +{ + return QAccessible::ScrollBar; +} #endif class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener diff --git a/src/templates/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h index 34ed8b8c..6171d26e 100644 --- a/src/templates/qquickscrollbar_p.h +++ b/src/templates/qquickscrollbar_p.h @@ -107,6 +107,7 @@ protected: #ifndef QT_NO_ACCESSIBILITY void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; #endif private: diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp index d8bc8d06..81a96ac5 100644 --- a/src/templates/qquickscrollindicator.cpp +++ b/src/templates/qquickscrollindicator.cpp @@ -82,7 +82,6 @@ public: QQuickScrollIndicatorPrivate() : size(0), position(0), active(false), orientation(Qt::Vertical), indicator(Q_NULLPTR) { - m_accessibleRole = 0x00000027; //QAccessible::Indicator } qreal size; @@ -382,4 +381,11 @@ void QQuickScrollIndicatorAttached::setVertical(QQuickScrollIndicator *vertical) } } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickScrollIndicator::accessibleRole() const +{ + return QAccessible::Indicator; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h index 752e7d4f..e67118b4 100644 --- a/src/templates/qquickscrollindicator_p.h +++ b/src/templates/qquickscrollindicator_p.h @@ -93,6 +93,11 @@ Q_SIGNALS: void orientationChanged(); void indicatorChanged(); +protected: +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickScrollIndicator) Q_DECLARE_PRIVATE(QQuickScrollIndicator) diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index 3413d504..b77de9d3 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -80,7 +80,6 @@ public: orientation(Qt::Horizontal), snapMode(QQuickSlider::NoSnap), handle(Q_NULLPTR), track(Q_NULLPTR) { - m_accessibleRole = 0x00000033; // QAccessible::Slider } qreal valueAt(qreal position) const; @@ -566,6 +565,11 @@ void QQuickSlider::accessibilityActiveChanged(bool active) if (active) setAccessibleProperty("pressed", d->pressed); } + +QAccessible::Role QQuickSlider::accessibleRole() const +{ + return QAccessible::Slider; +} #endif QT_END_NAMESPACE diff --git a/src/templates/qquickslider_p.h b/src/templates/qquickslider_p.h index 9b37d740..02d26538 100644 --- a/src/templates/qquickslider_p.h +++ b/src/templates/qquickslider_p.h @@ -138,6 +138,7 @@ protected: #ifndef QT_NO_ACCESSIBILITY void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; #endif private: diff --git a/src/templates/qquickspinbox.cpp b/src/templates/qquickspinbox.cpp index cac210ec..e1596e3a 100644 --- a/src/templates/qquickspinbox.cpp +++ b/src/templates/qquickspinbox.cpp @@ -219,7 +219,6 @@ QQuickSpinBox::QQuickSpinBox(QQuickItem *parent) : setFlag(ItemIsFocusScope); setFiltersChildMouseEvents(true); - setAccessibleRole(0x00000034); //QAccessible::SpinBox } /*! @@ -475,6 +474,13 @@ void QQuickSpinBox::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) newItem->setActiveFocusOnTab(true); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickSpinBox::accessibleRole() const +{ + return QAccessible::SpinBox; +} +#endif + class QQuickSpinnerPrivate : public QObjectPrivate { public: diff --git a/src/templates/qquickspinbox_p.h b/src/templates/qquickspinbox_p.h index 9188d397..e78979f9 100644 --- a/src/templates/qquickspinbox_p.h +++ b/src/templates/qquickspinbox_p.h @@ -108,6 +108,10 @@ protected: void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickSpinBox) Q_DECLARE_PRIVATE(QQuickSpinBox) diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp index e72a0933..1c8cc435 100644 --- a/src/templates/qquicktabbar.cpp +++ b/src/templates/qquicktabbar.cpp @@ -68,7 +68,6 @@ class QQuickTabBarPrivate : public QQuickContainerPrivate public: QQuickTabBarPrivate() { - m_accessibleRole = 0x0000003C; //QAccessible::PageTabList } void updateLayout(); @@ -138,4 +137,11 @@ void QQuickTabBar::itemRemoved(int index, QQuickItem *item) polish(); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickTabBar::accessibleRole() const +{ + return QAccessible::PageTabList; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h index d5e3c70d..8300aca6 100644 --- a/src/templates/qquicktabbar_p.h +++ b/src/templates/qquicktabbar_p.h @@ -68,6 +68,10 @@ protected: void itemAdded(int index, QQuickItem *item) Q_DECL_OVERRIDE; void itemRemoved(int index, QQuickItem *item) Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif + private: Q_DISABLE_COPY(QQuickTabBar) Q_DECLARE_PRIVATE(QQuickTabBar) diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp index deb14a98..a301cc62 100644 --- a/src/templates/qquicktabbutton.cpp +++ b/src/templates/qquicktabbutton.cpp @@ -60,7 +60,13 @@ QQuickTabButton::QQuickTabButton(QQuickItem *parent) : { setCheckable(true); setExclusive(true); - setAccessibleRole(0x00000025); //QAccessible::PageTab } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickTabButton::accessibleRole() const +{ + return QAccessible::PageTab; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h index 3dfa360f..820fa365 100644 --- a/src/templates/qquicktabbutton_p.h +++ b/src/templates/qquicktabbutton_p.h @@ -58,6 +58,11 @@ class Q_LABSTEMPLATES_EXPORT QQuickTabButton : public QQuickAbstractButton public: explicit QQuickTabButton(QQuickItem *parent = Q_NULLPTR); + +protected: +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif }; Q_DECLARE_TYPEINFO(QQuickTabButton, Q_COMPLEX_TYPE); diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index dafa040b..e9b33399 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -72,8 +72,6 @@ QT_BEGIN_NAMESPACE QQuickTextAreaPrivate::QQuickTextAreaPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR), accessibleAttached(Q_NULLPTR) - , m_accessibleRole(0x0000002A) // Accessible.EditableText - { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); @@ -192,7 +190,7 @@ void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active) Q_Q(QQuickTextArea); accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true)); if (accessibleAttached) { - accessibleAttached->setRole((QAccessible::Role)m_accessibleRole); + accessibleAttached->setRole(accessibleRole()); accessibleAttached->set_readOnly(q->isReadOnly()); if (placeholder) accessibleAttached->setDescription(placeholder->text()); @@ -203,7 +201,7 @@ void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active) QAccessible::Role QQuickTextAreaPrivate::accessibleRole() const { - return QAccessible::Role(m_accessibleRole); + return QAccessible::EditableText; } #endif diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h index 01959354..ba71ecf8 100644 --- a/src/templates/qquicktextarea_p_p.h +++ b/src/templates/qquicktextarea_p_p.h @@ -96,7 +96,6 @@ public: QQuickText *placeholder; QQuickPressAndHoldHelper pressAndHoldHelper; QQuickAccessibleAttached *accessibleAttached; - int m_accessibleRole; }; Q_DECLARE_TYPEINFO(QQuickTextAreaPrivate, Q_COMPLEX_TYPE); diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index 61cac6c4..b55c799e 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -92,7 +92,6 @@ QQuickTextFieldPrivate::QQuickTextFieldPrivate() : background(Q_NULLPTR) , placeholder(Q_NULLPTR) , accessibleAttached(Q_NULLPTR) - , m_accessibleRole(0x0000002A) // Accessible.EditableText { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); @@ -223,7 +222,7 @@ void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active) Q_Q(QQuickTextField); accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true)); if (accessibleAttached) { - accessibleAttached->setRole((QAccessible::Role)m_accessibleRole); + accessibleAttached->setRole(accessibleRole()); accessibleAttached->set_readOnly(m_readOnly); accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); if (placeholder) @@ -235,7 +234,7 @@ void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active) QAccessible::Role QQuickTextFieldPrivate::accessibleRole() const { - return QAccessible::Role(m_accessibleRole); + return QAccessible::EditableText; } #endif diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h index 3c73983d..324ee6fb 100644 --- a/src/templates/qquicktextfield_p_p.h +++ b/src/templates/qquicktextfield_p_p.h @@ -97,7 +97,6 @@ public: QQuickText *placeholder; QQuickPressAndHoldHelper pressAndHoldHelper; QQuickAccessibleAttached *accessibleAttached; - int m_accessibleRole; }; Q_DECLARE_TYPEINFO(QQuickTextFieldPrivate, Q_COMPLEX_TYPE); diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp index fef95100..c20303e8 100644 --- a/src/templates/qquicktoolbar.cpp +++ b/src/templates/qquicktoolbar.cpp @@ -92,7 +92,13 @@ QT_BEGIN_NAMESPACE QQuickToolBar::QQuickToolBar(QQuickItem *parent) : QQuickFrame(parent) { - setAccessibleRole(0x00000016); //QAccessible::ToolBar } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickToolBar::accessibleRole() const +{ + return QAccessible::ToolBar; +} +#endif + QT_END_NAMESPACE diff --git a/src/templates/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h index d45106ee..065f1f71 100644 --- a/src/templates/qquicktoolbar_p.h +++ b/src/templates/qquicktoolbar_p.h @@ -58,6 +58,11 @@ class Q_LABSTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame public: explicit QQuickToolBar(QQuickItem *parent = Q_NULLPTR); + +protected: +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; +#endif }; Q_DECLARE_TYPEINFO(QQuickToolBar, Q_COMPLEX_TYPE); |