diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-09 12:52:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-15 18:03:30 +0200 |
| commit | f53f7095044275767e389d16aabad5ff7144ec9f (patch) | |
| tree | aae3ceac5dde1140c4bdf42cf2153126c9c34232 /src/widgets/widgets/qmenu.cpp | |
| parent | 6dbe45c96a6b807cfc19c34cf2833504148d019f (diff) | |
Replace QT_NO_ACCESSIBILITY with QT_CONFIG(accessibility)
Pick-to: 6.4
Change-Id: Iee4bd8970810be1b23bdba65a74de912401dca65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 3c49ba5af4..0c493b3f67 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -15,7 +15,7 @@ #include "qpainter.h" #include <qpa/qplatformtheme.h> #include "qapplication.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) # include "qaccessible.h" #endif #if QT_CONFIG(effects) @@ -1462,7 +1462,7 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e if (action_e == QAction::Hover) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { int actionIndex = indexOf(action); QAccessibleEvent focusEvent(q, QAccessible::Focus); @@ -2540,7 +2540,7 @@ void QMenuPrivate::popup(const QPoint &p, QAction *atAction, PositionFunction po q->show(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(q, QAccessible::PopupMenuStart); QAccessible::updateAccessibility(&event); #endif @@ -2669,7 +2669,7 @@ void QMenu::hideEvent(QHideEvent *) if (d->eventLoop) d->eventLoop->exit(); d->setCurrentAction(nullptr); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::PopupMenuEnd); QAccessible::updateAccessibility(&event); #endif |