diff options
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/accessibility/accessibility.pro | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index eb1a7be8..f55aabb6 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -789,10 +789,12 @@ void QQuickComboBoxPrivate::hideOldPopup(QQuickPopup *popup) popup->setVisible(false); popup->setParentItem(nullptr); +#if QT_CONFIG(accessibility) // Remove the item from the accessibility tree. QQuickAccessibleAttached *accessible = accessibleAttached(popup); if (accessible) accessible->setIgnored(true); +#endif } QQuickComboBox::QQuickComboBox(QQuickItem *parent) diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 6b3580de..c5a5fd7a 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -773,10 +773,12 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item) item->setVisible(false); item->setParentItem(nullptr); +#if QT_CONFIG(accessibility) // Remove the item from the accessibility tree. QQuickAccessibleAttached *accessible = accessibleAttached(item); if (accessible) accessible->setIgnored(true); +#endif } void QQuickControlPrivate::updateBaselineOffset() diff --git a/tests/auto/accessibility/accessibility.pro b/tests/auto/accessibility/accessibility.pro index dd8e60a7..d8d5bb95 100644 --- a/tests/auto/accessibility/accessibility.pro +++ b/tests/auto/accessibility/accessibility.pro @@ -1,5 +1,6 @@ CONFIG += testcase TARGET = tst_accessibility +requires(qtConfig(accessibility)) SOURCES += tst_accessibility.cpp macos:CONFIG -= app_bundle |