Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2870 from kb-1000/fix-accessibility

Browse Source 
Add checks for QT_NO_ACCESSIBILITY to prevent build issues with Qt without accessibility
This commit is contained in:
Petr Mrázek 2019-10-01 15:40:39 +02:00 committed by GitHub
commit e27309d08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/MultiMC.cpp
View File

@ -535,7 +535,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
qDebug() << "<> Settings loaded."; qDebug() << "<> Settings loaded.";
} }
#ifndef QT_NO_ACCESSIBILITY
QAccessible::installFactory(groupViewAccessibleFactory); QAccessible::installFactory(groupViewAccessibleFactory);
#endif /* !QT_NO_ACCESSIBILITY */
// load translations // load translations
{ {

4
application/groupview/AccessibleGroupView.cpp
View File

@ -6,6 +6,8 @@
#include <qaccessible.h> #include <qaccessible.h>
#include <qheaderview.h> #include <qheaderview.h>
#ifndef QT_NO_ACCESSIBILITY
QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object) QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object)
{ {
QAccessibleInterface *iface = 0; QAccessibleInterface *iface = 0;
@ -772,3 +774,5 @@ QAccessibleInterface *AccessibleGroupViewItem::child(int) const
{ {
return 0; return 0;
} }
#endif /* !QT_NO_ACCESSIBILITY */

3
application/groupview/AccessibleGroupView_p.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <qtguiglobal.h>
#ifndef QT_NO_ACCESSIBILITY
#include "GroupView.h" #include "GroupView.h"
#include "QtCore/qpointer.h" #include "QtCore/qpointer.h"
#include <QtGui/qaccessible.h> #include <QtGui/qaccessible.h>
@ -114,3 +116,4 @@ private:
friend class AccessibleGroupView; friend class AccessibleGroupView;
}; };
#endif /* !QT_NO_ACCESSIBILITY */

2
application/groupview/GroupView.cpp
View File

@ -93,11 +93,13 @@ void GroupView::currentChanged(const QModelIndex& current, const QModelIndex& pr
{ {
QAbstractItemView::currentChanged(current, previous); QAbstractItemView::currentChanged(current, previous);
// TODO: for accessibility support, implement+register a factory, steal QAccessibleTable from Qt and return an instance of it for GroupView. // 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()) { if (QAccessible::isActive() && current.isValid()) {
QAccessibleEvent event(this, QAccessible::Focus); QAccessibleEvent event(this, QAccessible::Focus);
event.setChild(current.row()); event.setChild(current.row());
QAccessible::updateAccessibility(&event); QAccessible::updateAccessibility(&event);
} }
#endif /* !QT_NO_ACCESSIBILITY */
} }

2
application/widgets/VersionListView.cpp
View File

@ -82,7 +82,9 @@ void VersionListView::setEmptyMode(VersionListView::EmptyMode mode)
void VersionListView::updateEmptyViewPort() void VersionListView::updateEmptyViewPort()
{ {
#ifndef QT_NO_ACCESSIBILITY
setAccessibleDescription(currentEmptyString()); setAccessibleDescription(currentEmptyString());
#endif /* !QT_NO_ACCESSIBILITY */
if(!m_itemCount) if(!m_itemCount)
{ {