diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-04-28 08:42:08 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypickbot@codereview.qt-project.org> | 2020-05-26 11:50:57 +0000 |
| commit | dc6b423a2f642052dbd38de0d8b76ed7435e77fa (patch) | |
| tree | 5e07425596399699e5c30db922e75f1a57a1af73 | |
| parent | e75304c3314247b4728ed9e64974965803295957 (diff) | |
Fix -no-accessibility build
Change-Id: Icbae79fd0f48fb9351ee8cc12b35ead7e99b09e2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 1f919391eee10e888a811ff1cd8676f55ca78692)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 d7a67325..3b87e489 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -787,10 +787,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 4eb411c2..64260401 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -858,10 +858,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 |