From 68562989786f2890fb244bbee7de4c7d00ab60ae Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 23 Feb 2017 15:18:57 +0100 Subject: Port from QT_NO_ACCESSIBILITY to QT_CONFIG(accessibility) Change-Id: I03deebff661746d49e537af5b1c8899b938efb0d Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickabstractbutton.cpp | 2 +- src/quicktemplates2/qquickabstractbutton_p.h | 2 +- src/quicktemplates2/qquickbusyindicator.cpp | 2 +- src/quicktemplates2/qquickbusyindicator_p.h | 2 +- src/quicktemplates2/qquickcheckbox.cpp | 2 +- src/quicktemplates2/qquickcheckbox_p.h | 2 +- src/quicktemplates2/qquickcheckdelegate.cpp | 2 +- src/quicktemplates2/qquickcheckdelegate_p.h | 2 +- src/quicktemplates2/qquickcombobox.cpp | 4 ++-- src/quicktemplates2/qquickcombobox_p.h | 2 +- src/quicktemplates2/qquickcontrol.cpp | 18 +++++++++--------- src/quicktemplates2/qquickcontrol_p.h | 4 ++-- src/quicktemplates2/qquickcontrol_p_p.h | 6 +++--- src/quicktemplates2/qquickdial.cpp | 2 +- src/quicktemplates2/qquickdial_p.h | 2 +- src/quicktemplates2/qquickdialog.cpp | 2 +- src/quicktemplates2/qquickdialog_p.h | 2 +- src/quicktemplates2/qquickdialogbuttonbox.cpp | 2 +- src/quicktemplates2/qquickdialogbuttonbox_p.h | 2 +- src/quicktemplates2/qquickframe.cpp | 4 ++-- src/quicktemplates2/qquickframe_p.h | 2 +- src/quicktemplates2/qquickgroupbox.cpp | 4 ++-- src/quicktemplates2/qquickgroupbox_p.h | 2 +- src/quicktemplates2/qquickitemdelegate.cpp | 2 +- src/quicktemplates2/qquickitemdelegate_p.h | 2 +- src/quicktemplates2/qquicklabel.cpp | 12 ++++++------ src/quicktemplates2/qquicklabel_p_p.h | 6 +++--- src/quicktemplates2/qquickmenu.cpp | 4 ++-- src/quicktemplates2/qquickmenu_p.h | 4 ++-- src/quicktemplates2/qquickmenuitem.cpp | 2 +- src/quicktemplates2/qquickmenuitem_p.h | 2 +- src/quicktemplates2/qquickmenuseparator.cpp | 2 +- src/quicktemplates2/qquickmenuseparator_p.h | 2 +- src/quicktemplates2/qquickpage.cpp | 2 +- src/quicktemplates2/qquickpage_p.h | 2 +- src/quicktemplates2/qquickpageindicator.cpp | 2 +- src/quicktemplates2/qquickpageindicator_p.h | 2 +- src/quicktemplates2/qquickpane.cpp | 2 +- src/quicktemplates2/qquickpane_p.h | 2 +- src/quicktemplates2/qquickpopup.cpp | 4 ++-- src/quicktemplates2/qquickpopup_p.h | 4 ++-- src/quicktemplates2/qquickpopupitem.cpp | 4 ++-- src/quicktemplates2/qquickpopupitem_p_p.h | 2 +- src/quicktemplates2/qquickprogressbar.cpp | 2 +- src/quicktemplates2/qquickprogressbar_p.h | 2 +- src/quicktemplates2/qquickradiobutton.cpp | 2 +- src/quicktemplates2/qquickradiobutton_p.h | 2 +- src/quicktemplates2/qquickradiodelegate.cpp | 2 +- src/quicktemplates2/qquickradiodelegate_p.h | 2 +- src/quicktemplates2/qquickrangeslider.cpp | 2 +- src/quicktemplates2/qquickrangeslider_p.h | 2 +- src/quicktemplates2/qquickscrollbar.cpp | 2 +- src/quicktemplates2/qquickscrollbar_p.h | 2 +- src/quicktemplates2/qquickscrollindicator.cpp | 2 +- src/quicktemplates2/qquickscrollindicator_p.h | 2 +- src/quicktemplates2/qquickscrollview.cpp | 2 +- src/quicktemplates2/qquickscrollview_p.h | 2 +- src/quicktemplates2/qquickslider.cpp | 2 +- src/quicktemplates2/qquickslider_p.h | 2 +- src/quicktemplates2/qquickspinbox.cpp | 2 +- src/quicktemplates2/qquickspinbox_p.h | 2 +- src/quicktemplates2/qquickstackview.cpp | 2 +- src/quicktemplates2/qquickstackview_p.h | 2 +- src/quicktemplates2/qquickswipedelegate.cpp | 2 +- src/quicktemplates2/qquickswipedelegate_p.h | 2 +- src/quicktemplates2/qquickswipeview.cpp | 2 +- src/quicktemplates2/qquickswipeview_p.h | 2 +- src/quicktemplates2/qquicktabbar.cpp | 2 +- src/quicktemplates2/qquicktabbar_p.h | 2 +- src/quicktemplates2/qquicktabbutton.cpp | 2 +- src/quicktemplates2/qquicktabbutton_p.h | 2 +- src/quicktemplates2/qquicktextarea.cpp | 14 +++++++------- src/quicktemplates2/qquicktextarea_p_p.h | 6 +++--- src/quicktemplates2/qquicktextfield.cpp | 16 ++++++++-------- src/quicktemplates2/qquicktextfield_p_p.h | 6 +++--- src/quicktemplates2/qquicktoolbar.cpp | 2 +- src/quicktemplates2/qquicktoolbar_p.h | 2 +- src/quicktemplates2/qquicktoolseparator.cpp | 2 +- src/quicktemplates2/qquicktoolseparator_p.h | 2 +- src/quicktemplates2/qquicktooltip.cpp | 2 +- src/quicktemplates2/qquicktooltip_p.h | 2 +- 81 files changed, 124 insertions(+), 124 deletions(-) (limited to 'src') diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 1012061c..225ab9ab 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -742,7 +742,7 @@ void QQuickAbstractButton::nextCheckState() d->toggle(!d->checked); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickAbstractButton::accessibilityActiveChanged(bool active) { QQuickControl::accessibilityActiveChanged(active); diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index 82da94bd..28a59c00 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -139,7 +139,7 @@ protected: virtual void nextCheckState(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp index 9ab02e73..883066d7 100644 --- a/src/quicktemplates2/qquickbusyindicator.cpp +++ b/src/quicktemplates2/qquickbusyindicator.cpp @@ -115,7 +115,7 @@ void QQuickBusyIndicator::setRunning(bool running) emit runningChanged(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickBusyIndicator::accessibleRole() const { return QAccessible::Indicator; diff --git a/src/quicktemplates2/qquickbusyindicator_p.h b/src/quicktemplates2/qquickbusyindicator_p.h index 5beb2dbe..3607cc1f 100644 --- a/src/quicktemplates2/qquickbusyindicator_p.h +++ b/src/quicktemplates2/qquickbusyindicator_p.h @@ -69,7 +69,7 @@ Q_SIGNALS: void runningChanged(); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp index 26e266e7..e0c7faf1 100644 --- a/src/quicktemplates2/qquickcheckbox.cpp +++ b/src/quicktemplates2/qquickcheckbox.cpp @@ -191,7 +191,7 @@ void QQuickCheckBox::nextCheckState() QQuickAbstractButton::nextCheckState(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickCheckBox::accessibleRole() const { return QAccessible::CheckBox; diff --git a/src/quicktemplates2/qquickcheckbox_p.h b/src/quicktemplates2/qquickcheckbox_p.h index d4d66561..dfd935d3 100644 --- a/src/quicktemplates2/qquickcheckbox_p.h +++ b/src/quicktemplates2/qquickcheckbox_p.h @@ -79,7 +79,7 @@ protected: void buttonChange(ButtonChange change) override; void nextCheckState() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp index 7efda239..78d55e1d 100644 --- a/src/quicktemplates2/qquickcheckdelegate.cpp +++ b/src/quicktemplates2/qquickcheckdelegate.cpp @@ -188,7 +188,7 @@ void QQuickCheckDelegate::nextCheckState() QQuickItemDelegate::nextCheckState(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickCheckDelegate::accessibleRole() const { return QAccessible::CheckBox; diff --git a/src/quicktemplates2/qquickcheckdelegate_p.h b/src/quicktemplates2/qquickcheckdelegate_p.h index d50ddcc4..ae2b4f52 100644 --- a/src/quicktemplates2/qquickcheckdelegate_p.h +++ b/src/quicktemplates2/qquickcheckdelegate_p.h @@ -79,7 +79,7 @@ protected: void buttonChange(ButtonChange change) override; void nextCheckState() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index f1ff9994..3aabd238 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1553,7 +1553,7 @@ QFont QQuickComboBox::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::ComboMenuItemFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickComboBox::accessibleRole() const { return QAccessible::ComboBox; @@ -1567,6 +1567,6 @@ void QQuickComboBox::accessibilityActiveChanged(bool active) if (active) setAccessibleName(d->hasDisplayText ? d->displayText : d->currentText); } -#endif // QT_NO_ACCESSIBILITY +#endif // QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h index 083ea166..b6ed4906 100644 --- a/src/quicktemplates2/qquickcombobox_p.h +++ b/src/quicktemplates2/qquickcombobox_p.h @@ -195,7 +195,7 @@ protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index cf626e90..be050c76 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -53,7 +53,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -132,14 +132,14 @@ QQuickControlPrivate::QQuickControlPrivate() contentItem(nullptr), accessibleAttached(nullptr) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); #endif } QQuickControlPrivate::~QQuickControlPrivate() { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::removeActivationObserver(this); #endif } @@ -237,7 +237,7 @@ QQuickItem *QQuickControlPrivate::getContentItem() return contentItem; } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickControlPrivate::accessibilityActiveChanged(bool active) { Q_Q(QQuickControl); @@ -439,7 +439,7 @@ bool QQuickControlPrivate::calcHoverEnabled(const QQuickItem *item) QString QQuickControl::accessibleName() const { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_D(const QQuickControl); if (d->accessibleAttached) return d->accessibleAttached->name(); @@ -449,7 +449,7 @@ QString QQuickControl::accessibleName() const void QQuickControl::setAccessibleName(const QString &name) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_D(QQuickControl); if (d->accessibleAttached) d->accessibleAttached->setName(name); @@ -460,7 +460,7 @@ void QQuickControl::setAccessibleName(const QString &name) QVariant QQuickControl::accessibleProperty(const char *propertyName) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_D(QQuickControl); if (d->accessibleAttached) return QQuickAccessibleAttached::property(this, propertyName); @@ -471,7 +471,7 @@ QVariant QQuickControl::accessibleProperty(const char *propertyName) bool QQuickControl::setAccessibleProperty(const char *propertyName, const QVariant &value) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_D(QQuickControl); if (d->accessibleAttached) return QQuickAccessibleAttached::setProperty(this, propertyName, value); @@ -1226,7 +1226,7 @@ void QQuickControl::componentComplete() if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!d->accessibleAttached && QAccessible::isActive()) accessibilityActiveChanged(true); #endif diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index bd45a4dd..a94ef01d 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -200,12 +200,12 @@ protected: virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) virtual void accessibilityActiveChanged(bool active); virtual QAccessible::Role accessibleRole() const; #endif - // helper functions which avoid to check QT_NO_ACCESSIBILITY + // helper functions which avoid to check QT_CONFIG(accessibility) QString accessibleName() const; void setAccessibleName(const QString &name); diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 56a17834..14a468f3 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -54,7 +54,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -90,7 +90,7 @@ public: virtual QQuickItem *getContentItem(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 15399c7f..198bd631 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -768,7 +768,7 @@ void QQuickDial::componentComplete() d->updatePosition(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickDial::accessibilityActiveChanged(bool active) { QQuickControl::accessibilityActiveChanged(active); diff --git a/src/quicktemplates2/qquickdial_p.h b/src/quicktemplates2/qquickdial_p.h index f774e525..e402922d 100644 --- a/src/quicktemplates2/qquickdial_p.h +++ b/src/quicktemplates2/qquickdial_p.h @@ -147,7 +147,7 @@ protected: void mirrorChange() override; void componentComplete() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp index 9dba001d..fbb612b3 100644 --- a/src/quicktemplates2/qquickdialog.cpp +++ b/src/quicktemplates2/qquickdialog.cpp @@ -345,7 +345,7 @@ void QQuickDialog::spacingChange(qreal newSpacing, qreal oldSpacing) d->layout->update(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickDialog::accessibleRole() const { return QAccessible::Dialog; diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index 9c763b3e..97c90a59 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -97,7 +97,7 @@ protected: void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void spacingChange(qreal newSpacing, qreal oldSpacing) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index d125de91..a912ba6a 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -602,7 +602,7 @@ void QQuickDialogButtonBox::itemRemoved(int index, QQuickItem *item) polish(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickDialogButtonBox::accessibleRole() const { return QAccessible::PageTabList; diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h index 4aa7f9d2..9bd92c79 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h @@ -114,7 +114,7 @@ protected: void itemAdded(int index, QQuickItem *item) override; void itemRemoved(int index, QQuickItem *item) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp index 364f6a28..f880d917 100644 --- a/src/quicktemplates2/qquickframe.cpp +++ b/src/quicktemplates2/qquickframe.cpp @@ -78,11 +78,11 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) { } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickFrame::accessibleRole() const { return QAccessible::Border; } -#endif // QT_NO_ACCESSIBILITY +#endif QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickframe_p.h b/src/quicktemplates2/qquickframe_p.h index 4dc252f4..381088ec 100644 --- a/src/quicktemplates2/qquickframe_p.h +++ b/src/quicktemplates2/qquickframe_p.h @@ -64,7 +64,7 @@ public: protected: QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp index 55f59080..09bd49f6 100644 --- a/src/quicktemplates2/qquickgroupbox.cpp +++ b/src/quicktemplates2/qquickgroupbox.cpp @@ -153,7 +153,7 @@ QFont QQuickGroupBox::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::GroupBoxTitleFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickGroupBox::accessibleRole() const { return QAccessible::Grouping; @@ -167,6 +167,6 @@ void QQuickGroupBox::accessibilityActiveChanged(bool active) if (active) setAccessibleName(d->title); } -#endif // QT_NO_ACCESSIBILITY +#endif QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickgroupbox_p.h b/src/quicktemplates2/qquickgroupbox_p.h index 3b2c41d9..e35db1fc 100644 --- a/src/quicktemplates2/qquickgroupbox_p.h +++ b/src/quicktemplates2/qquickgroupbox_p.h @@ -76,7 +76,7 @@ Q_SIGNALS: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index 7e8b92db..1b93c145 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -125,7 +125,7 @@ QFont QQuickItemDelegate::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::ItemViewFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickItemDelegate::accessibleRole() const { return QAccessible::ListItem; diff --git a/src/quicktemplates2/qquickitemdelegate_p.h b/src/quicktemplates2/qquickitemdelegate_p.h index c5a9d998..a162ddee 100644 --- a/src/quicktemplates2/qquickitemdelegate_p.h +++ b/src/quicktemplates2/qquickitemdelegate_p.h @@ -71,7 +71,7 @@ Q_SIGNALS: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index a2a9fa59..45c7e5a4 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -42,7 +42,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -82,14 +82,14 @@ QQuickLabelPrivate::QQuickLabelPrivate() : background(nullptr), accessibleAttached(nullptr) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); #endif } QQuickLabelPrivate::~QQuickLabelPrivate() { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::removeActivationObserver(this); #endif } @@ -125,7 +125,7 @@ void QQuickLabelPrivate::inheritFont(const QFont &f) void QQuickLabelPrivate::textChanged(const QString &text) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (accessibleAttached) accessibleAttached->setName(text); #else @@ -133,7 +133,7 @@ void QQuickLabelPrivate::textChanged(const QString &text) #endif } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickLabelPrivate::accessibilityActiveChanged(bool active) { if (accessibleAttached || !active) @@ -221,7 +221,7 @@ void QQuickLabel::componentComplete() { Q_D(QQuickLabel); QQuickText::componentComplete(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h index 40445d36..c24c855b 100644 --- a/src/quicktemplates2/qquicklabel_p_p.h +++ b/src/quicktemplates2/qquicklabel_p_p.h @@ -50,7 +50,7 @@ #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; class QQuickLabelPrivate : public QQuickTextPrivate -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -79,7 +79,7 @@ public: void textChanged(const QString &text); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 98ddae30..04305cea 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -525,12 +525,12 @@ void QQuickMenu::keyReleaseEvent(QKeyEvent *event) item->forceActiveFocus(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickMenu::accessibleRole() const { return QAccessible::PopupMenu; } -#endif // QT_NO_ACCESSIBILITY +#endif QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index 146cf9b7..a899fe51 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -91,9 +91,9 @@ Q_SIGNALS: void titleChanged(); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; -#endif // QT_NO_ACCESSIBILITY +#endif private: Q_DISABLE_COPY(QQuickMenu) diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index 185686db..e15640fb 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -141,7 +141,7 @@ void QQuickMenuItem::setHighlighted(bool highlighted) emit highlightedChanged(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickMenuItem::accessibleRole() const { return QAccessible::MenuItem; diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h index 96aaa28a..76f41f9d 100644 --- a/src/quicktemplates2/qquickmenuitem_p.h +++ b/src/quicktemplates2/qquickmenuitem_p.h @@ -72,7 +72,7 @@ Q_SIGNALS: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp index 0a40b6f2..366f0a27 100644 --- a/src/quicktemplates2/qquickmenuseparator.cpp +++ b/src/quicktemplates2/qquickmenuseparator.cpp @@ -70,7 +70,7 @@ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent) { } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickMenuSeparator::accessibleRole() const { return QAccessible::Separator; diff --git a/src/quicktemplates2/qquickmenuseparator_p.h b/src/quicktemplates2/qquickmenuseparator_p.h index dde88df3..42147f77 100644 --- a/src/quicktemplates2/qquickmenuseparator_p.h +++ b/src/quicktemplates2/qquickmenuseparator_p.h @@ -60,7 +60,7 @@ public: explicit QQuickMenuSeparator(QQuickItem *parent = nullptr); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 13698500..701916b6 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -357,7 +357,7 @@ void QQuickPage::spacingChange(qreal newSpacing, qreal oldSpacing) d->layout->update(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickPage::accessibleRole() const { return QAccessible::PageTab; diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index e2d16adc..90d10e4a 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -102,7 +102,7 @@ protected: void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void spacingChange(qreal newSpacing, qreal oldSpacing) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp index 2abc321b..92b6c0c0 100644 --- a/src/quicktemplates2/qquickpageindicator.cpp +++ b/src/quicktemplates2/qquickpageindicator.cpp @@ -324,7 +324,7 @@ void QQuickPageIndicator::mouseUngrabEvent() d->updatePressed(false); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickPageIndicator::accessibleRole() const { return QAccessible::Indicator; diff --git a/src/quicktemplates2/qquickpageindicator_p.h b/src/quicktemplates2/qquickpageindicator_p.h index f1d76d5d..921fe7e8 100644 --- a/src/quicktemplates2/qquickpageindicator_p.h +++ b/src/quicktemplates2/qquickpageindicator_p.h @@ -92,7 +92,7 @@ protected: void mouseReleaseEvent(QMouseEvent *event) override; void mouseUngrabEvent() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index ffd56b3a..6cb81316 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -241,7 +241,7 @@ void QQuickPane::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) emit contentChildrenChanged(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickPane::accessibleRole() const { return QAccessible::Pane; diff --git a/src/quicktemplates2/qquickpane_p.h b/src/quicktemplates2/qquickpane_p.h index c0b04edb..759c59d8 100644 --- a/src/quicktemplates2/qquickpane_p.h +++ b/src/quicktemplates2/qquickpane_p.h @@ -86,7 +86,7 @@ protected: void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 80c530eb..ace82553 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1938,7 +1938,7 @@ QFont QQuickPopup::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickPopup::accessibleRole() const { return QAccessible::Dialog; @@ -1948,7 +1948,7 @@ void QQuickPopup::accessibilityActiveChanged(bool active) { Q_UNUSED(active); } -#endif // QT_NO_ACCESSIBILITY +#endif QString QQuickPopup::accessibleName() const { diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h index 41b85dab..d1b0dfac 100644 --- a/src/quicktemplates2/qquickpopup_p.h +++ b/src/quicktemplates2/qquickpopup_p.h @@ -59,7 +59,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -366,7 +366,7 @@ protected: virtual QFont defaultFont() const; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) virtual QAccessible::Role accessibleRole() const; virtual void accessibilityActiveChanged(bool active); #endif diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 1eb11c66..94bd7dec 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -285,7 +285,7 @@ QFont QQuickPopupItem::defaultFont() const return d->popup->defaultFont(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickPopupItem::accessibleRole() const { Q_D(const QQuickPopupItem); @@ -298,6 +298,6 @@ void QQuickPopupItem::accessibilityActiveChanged(bool active) QQuickControl::accessibilityActiveChanged(active); d->popup->accessibilityActiveChanged(active); } -#endif // QT_NO_ACCESSIBILITY +#endif QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates2/qquickpopupitem_p_p.h index 5cc4095f..ef97b038 100644 --- a/src/quicktemplates2/qquickpopupitem_p_p.h +++ b/src/quicktemplates2/qquickpopupitem_p_p.h @@ -92,7 +92,7 @@ protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index 73050cf4..c5a24f6c 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -269,7 +269,7 @@ void QQuickProgressBar::componentComplete() setValue(d->value); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickProgressBar::accessibleRole() const { return QAccessible::ProgressBar; diff --git a/src/quicktemplates2/qquickprogressbar_p.h b/src/quicktemplates2/qquickprogressbar_p.h index fc2d6c43..f2284c65 100644 --- a/src/quicktemplates2/qquickprogressbar_p.h +++ b/src/quicktemplates2/qquickprogressbar_p.h @@ -94,7 +94,7 @@ protected: void mirrorChange() override; void componentComplete() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp index db9613f1..c923fbbf 100644 --- a/src/quicktemplates2/qquickradiobutton.cpp +++ b/src/quicktemplates2/qquickradiobutton.cpp @@ -102,7 +102,7 @@ QFont QQuickRadioButton::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::RadioButtonFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickRadioButton::accessibleRole() const { return QAccessible::RadioButton; diff --git a/src/quicktemplates2/qquickradiobutton_p.h b/src/quicktemplates2/qquickradiobutton_p.h index 0e16a36c..0fe4eb70 100644 --- a/src/quicktemplates2/qquickradiobutton_p.h +++ b/src/quicktemplates2/qquickradiobutton_p.h @@ -62,7 +62,7 @@ public: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif }; diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp index bbc6664c..fe603d36 100644 --- a/src/quicktemplates2/qquickradiodelegate.cpp +++ b/src/quicktemplates2/qquickradiodelegate.cpp @@ -103,7 +103,7 @@ QFont QQuickRadioDelegate::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickRadioDelegate::accessibleRole() const { return QAccessible::RadioButton; diff --git a/src/quicktemplates2/qquickradiodelegate_p.h b/src/quicktemplates2/qquickradiodelegate_p.h index 9e3cde6b..4db9959d 100644 --- a/src/quicktemplates2/qquickradiodelegate_p.h +++ b/src/quicktemplates2/qquickradiodelegate_p.h @@ -64,7 +64,7 @@ public: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif }; diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index b4d5a2f2..1c74f9ee 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -1116,7 +1116,7 @@ void QQuickRangeSlider::componentComplete() \sa second */ -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickRangeSlider::accessibleRole() const { return QAccessible::Slider; diff --git a/src/quicktemplates2/qquickrangeslider_p.h b/src/quicktemplates2/qquickrangeslider_p.h index 71b803f4..d07cb6f0 100644 --- a/src/quicktemplates2/qquickrangeslider_p.h +++ b/src/quicktemplates2/qquickrangeslider_p.h @@ -124,7 +124,7 @@ protected: void mirrorChange() override; void componentComplete() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index bfdc45d4..3dcb720a 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -612,7 +612,7 @@ void QQuickScrollBar::hoverChange() } #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickScrollBar::accessibilityActiveChanged(bool active) { QQuickControl::accessibilityActiveChanged(active); diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index eef7d2ff..1b18c4ad 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -139,7 +139,7 @@ protected: void hoverChange() override; #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index a57cfbb6..347c2a68 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -535,7 +535,7 @@ void QQuickScrollIndicatorAttached::setVertical(QQuickScrollIndicator *vertical) emit verticalChanged(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickScrollIndicator::accessibleRole() const { return QAccessible::Indicator; diff --git a/src/quicktemplates2/qquickscrollindicator_p.h b/src/quicktemplates2/qquickscrollindicator_p.h index c4408500..bc6c5418 100644 --- a/src/quicktemplates2/qquickscrollindicator_p.h +++ b/src/quicktemplates2/qquickscrollindicator_p.h @@ -89,7 +89,7 @@ Q_SIGNALS: void orientationChanged(); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp index cf1fac48..fc763511 100644 --- a/src/quicktemplates2/qquickscrollview.cpp +++ b/src/quicktemplates2/qquickscrollview.cpp @@ -562,7 +562,7 @@ void QQuickScrollView::contentItemChange(QQuickItem *newItem, QQuickItem *oldIte d->setFlickable(qobject_cast(newItem), false); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickScrollView::accessibleRole() const { return QAccessible::Pane; diff --git a/src/quicktemplates2/qquickscrollview_p.h b/src/quicktemplates2/qquickscrollview_p.h index 353f2fc9..136260c2 100644 --- a/src/quicktemplates2/qquickscrollview_p.h +++ b/src/quicktemplates2/qquickscrollview_p.h @@ -89,7 +89,7 @@ protected: void componentComplete() override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 6c03536f..266f883f 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -735,7 +735,7 @@ void QQuickSlider::componentComplete() d->updatePosition(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickSlider::accessibilityActiveChanged(bool active) { QQuickControl::accessibilityActiveChanged(active); diff --git a/src/quicktemplates2/qquickslider_p.h b/src/quicktemplates2/qquickslider_p.h index 286047ed..a6cf02fb 100644 --- a/src/quicktemplates2/qquickslider_p.h +++ b/src/quicktemplates2/qquickslider_p.h @@ -145,7 +145,7 @@ protected: void mirrorChange() override; void componentComplete() override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index da3ea40e..657102c3 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -921,7 +921,7 @@ QFont QQuickSpinBox::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::EditorFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickSpinBox::accessibleRole() const { return QAccessible::SpinBox; diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index bd909126..3d554870 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -149,7 +149,7 @@ protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index 83a26e4f..a9922704 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -1011,7 +1011,7 @@ bool QQuickStackView::childMouseEventFilter(QQuickItem *item, QEvent *event) return window && !window->mouseGrabberItem(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickStackView::accessibleRole() const { return QAccessible::LayeredPane; diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h index cc2e4ee2..b74a162d 100644 --- a/src/quicktemplates2/qquickstackview_p.h +++ b/src/quicktemplates2/qquickstackview_p.h @@ -153,7 +153,7 @@ protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; bool childMouseEventFilter(QQuickItem *, QEvent *) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 2ca54312..7824708a 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -1226,7 +1226,7 @@ QFont QQuickSwipeDelegate::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickSwipeDelegate::accessibleRole() const { return QAccessible::ListItem; diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h index 36f82276..34d11c0f 100644 --- a/src/quicktemplates2/qquickswipedelegate_p.h +++ b/src/quicktemplates2/qquickswipedelegate_p.h @@ -82,7 +82,7 @@ protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index dca2fbf4..cc015bd3 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -228,7 +228,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item) item->setSize(QSizeF(d->contentItem->width(), d->contentItem->height())); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickSwipeView::accessibleRole() const { return QAccessible::PageTabList; diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h index 8a46f0d2..e07ed7f0 100644 --- a/src/quicktemplates2/qquickswipeview_p.h +++ b/src/quicktemplates2/qquickswipeview_p.h @@ -80,7 +80,7 @@ protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void itemAdded(int index, QQuickItem *item) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index 7696e51c..7ce8a21e 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -390,7 +390,7 @@ void QQuickTabBar::itemRemoved(int index, QQuickItem *item) polish(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickTabBar::accessibleRole() const { return QAccessible::PageTabList; diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h index 1d85d414..bc228346 100644 --- a/src/quicktemplates2/qquicktabbar_p.h +++ b/src/quicktemplates2/qquicktabbar_p.h @@ -94,7 +94,7 @@ protected: void itemAdded(int index, QQuickItem *item) override; void itemRemoved(int index, QQuickItem *item) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp index c7190a6a..9afe5363 100644 --- a/src/quicktemplates2/qquicktabbutton.cpp +++ b/src/quicktemplates2/qquicktabbutton.cpp @@ -75,7 +75,7 @@ QFont QQuickTabButton::defaultFont() const return QQuickControlPrivate::themeFont(QPlatformTheme::TabButtonFont); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickTabButton::accessibleRole() const { return QAccessible::PageTab; diff --git a/src/quicktemplates2/qquicktabbutton_p.h b/src/quicktemplates2/qquicktabbutton_p.h index b9f93bb6..49ecee50 100644 --- a/src/quicktemplates2/qquicktabbutton_p.h +++ b/src/quicktemplates2/qquicktabbutton_p.h @@ -62,7 +62,7 @@ public: protected: QFont defaultFont() const override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif }; diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index bc8dad8f..9fbf9764 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -45,7 +45,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -141,14 +141,14 @@ QQuickTextAreaPrivate::QQuickTextAreaPrivate() accessibleAttached(nullptr), flickable(nullptr) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); #endif } QQuickTextAreaPrivate::~QQuickTextAreaPrivate() { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::removeActivationObserver(this); #endif } @@ -358,7 +358,7 @@ void QQuickTextAreaPrivate::implicitHeightChanged() void QQuickTextAreaPrivate::readOnlyChanged(bool isReadOnly) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (accessibleAttached) accessibleAttached->set_readOnly(isReadOnly); #else @@ -366,7 +366,7 @@ void QQuickTextAreaPrivate::readOnlyChanged(bool isReadOnly) #endif } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active) { if (accessibleAttached || !active) @@ -476,7 +476,7 @@ void QQuickTextArea::setPlaceholderText(const QString &text) return; d->placeholder = text; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (d->accessibleAttached) d->accessibleAttached->setDescription(text); #endif @@ -603,7 +603,7 @@ void QQuickTextArea::componentComplete() if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h index 48336353..ef2c7237 100644 --- a/src/quicktemplates2/qquicktextarea_p_p.h +++ b/src/quicktemplates2/qquicktextarea_p_p.h @@ -54,7 +54,7 @@ #include "qquicktextarea_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -64,7 +64,7 @@ class QQuickFlickable; class QQuickAccessibleAttached; class QQuickTextAreaPrivate : public QQuickTextEditPrivate, public QQuickItemChangeListener -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -103,7 +103,7 @@ public: void readOnlyChanged(bool isReadOnly); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 9ea6e62d..a15f923f 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -43,7 +43,7 @@ #include #include -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -121,14 +121,14 @@ QQuickTextFieldPrivate::QQuickTextFieldPrivate() focusReason(Qt::OtherFocusReason), accessibleAttached(nullptr) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); #endif } QQuickTextFieldPrivate::~QQuickTextFieldPrivate() { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::removeActivationObserver(this); #endif } @@ -221,7 +221,7 @@ void QQuickTextFieldPrivate::implicitHeightChanged() void QQuickTextFieldPrivate::readOnlyChanged(bool isReadOnly) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (accessibleAttached) accessibleAttached->set_readOnly(isReadOnly); #else @@ -231,7 +231,7 @@ void QQuickTextFieldPrivate::readOnlyChanged(bool isReadOnly) void QQuickTextFieldPrivate::echoModeChanged(QQuickTextField::EchoMode echoMode) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (accessibleAttached) accessibleAttached->set_passwordEdit((echoMode == QQuickTextField::Password || echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); #else @@ -239,7 +239,7 @@ void QQuickTextFieldPrivate::echoModeChanged(QQuickTextField::EchoMode echoMode) #endif } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active) { if (accessibleAttached || !active) @@ -345,7 +345,7 @@ void QQuickTextField::setPlaceholderText(const QString &text) return; d->placeholder = text; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (d->accessibleAttached) d->accessibleAttached->setDescription(text); #endif @@ -464,7 +464,7 @@ void QQuickTextField::componentComplete() if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h index 443e2f14..31ccb361 100644 --- a/src/quicktemplates2/qquicktextfield_p_p.h +++ b/src/quicktemplates2/qquicktextfield_p_p.h @@ -53,7 +53,7 @@ #include "qquicktextfield_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include #endif @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; class QQuickTextFieldPrivate : public QQuickTextInputPrivate -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -92,7 +92,7 @@ public: void readOnlyChanged(bool isReadOnly); void echoModeChanged(QQuickTextField::EchoMode echoMode); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp index 1d2893c6..9f5f210e 100644 --- a/src/quicktemplates2/qquicktoolbar.cpp +++ b/src/quicktemplates2/qquicktoolbar.cpp @@ -141,7 +141,7 @@ void QQuickToolBar::setPosition(Position position) emit positionChanged(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickToolBar::accessibleRole() const { return QAccessible::ToolBar; diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h index 27dd37bb..58192ff9 100644 --- a/src/quicktemplates2/qquicktoolbar_p.h +++ b/src/quicktemplates2/qquicktoolbar_p.h @@ -75,7 +75,7 @@ Q_SIGNALS: void positionChanged(); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp index e3ffea98..4da63907 100644 --- a/src/quicktemplates2/qquicktoolseparator.cpp +++ b/src/quicktemplates2/qquicktoolseparator.cpp @@ -133,7 +133,7 @@ bool QQuickToolSeparator::isVertical() const return d->orientation == Qt::Vertical; } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickToolSeparator::accessibleRole() const { return QAccessible::Separator; diff --git a/src/quicktemplates2/qquicktoolseparator_p.h b/src/quicktemplates2/qquicktoolseparator_p.h index 552c6fa8..055f475c 100644 --- a/src/quicktemplates2/qquicktoolseparator_p.h +++ b/src/quicktemplates2/qquicktoolseparator_p.h @@ -74,7 +74,7 @@ Q_SIGNALS: void orientationChanged(); protected: -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 8fbf3353..bf83a725 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -307,7 +307,7 @@ void QQuickToolTip::timerEvent(QTimerEvent *event) } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickToolTip::accessibleRole() const { return QAccessible::ToolTip; diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h index 6fffa94e..bdfbe362 100644 --- a/src/quicktemplates2/qquicktooltip_p.h +++ b/src/quicktemplates2/qquicktooltip_p.h @@ -90,7 +90,7 @@ protected: void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; void timerEvent(QTimerEvent *event) override; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; #endif -- cgit v1.2.3