From dec6759e61cc844802b4eb105fed957c151e96ac Mon Sep 17 00:00:00 2001 From: kb1000 Date: Tue, 1 Oct 2019 14:28:06 +0200 Subject: Add checks for QT_NO_ACCESSIBILITY to prevent build issues with Qt without accessibility --- application/groupview/AccessibleGroupView.cpp | 4 ++++ application/groupview/AccessibleGroupView_p.h | 3 +++ application/groupview/GroupView.cpp | 2 ++ 3 files changed, 9 insertions(+) (limited to 'application/groupview') diff --git a/application/groupview/AccessibleGroupView.cpp b/application/groupview/AccessibleGroupView.cpp index 9a1bb821..c6541f18 100644 --- a/application/groupview/AccessibleGroupView.cpp +++ b/application/groupview/AccessibleGroupView.cpp @@ -6,6 +6,8 @@ #include #include +#ifndef QT_NO_ACCESSIBILITY + QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object) { QAccessibleInterface *iface = 0; @@ -772,3 +774,5 @@ QAccessibleInterface *AccessibleGroupViewItem::child(int) const { return 0; } + +#endif /* !QT_NO_ACCESSIBILITY */ diff --git a/application/groupview/AccessibleGroupView_p.h b/application/groupview/AccessibleGroupView_p.h index cdec1c0a..361e95f0 100644 --- a/application/groupview/AccessibleGroupView_p.h +++ b/application/groupview/AccessibleGroupView_p.h @@ -1,5 +1,7 @@ #pragma once +#include +#ifndef QT_NO_ACCESSIBILITY #include "GroupView.h" #include "QtCore/qpointer.h" #include @@ -114,3 +116,4 @@ private: friend class AccessibleGroupView; }; +#endif /* !QT_NO_ACCESSIBILITY */ diff --git a/application/groupview/GroupView.cpp b/application/groupview/GroupView.cpp index ff0daee4..5ccbfd39 100644 --- a/application/groupview/GroupView.cpp +++ b/application/groupview/GroupView.cpp @@ -93,11 +93,13 @@ void GroupView::currentChanged(const QModelIndex& current, const QModelIndex& pr { QAbstractItemView::currentChanged(current, previous); // TODO: for accessibility support, implement+register a factory, steal QAccessibleTable from Qt and return an instance of it for GroupView. +#ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive() && current.isValid()) { QAccessibleEvent event(this, QAccessible::Focus); event.setChild(current.row()); QAccessible::updateAccessibility(&event); } +#endif /* !QT_NO_ACCESSIBILITY */ } -- cgit