diff options
Diffstat (limited to 'src/plugins/accessible')
-rw-r--r-- | src/plugins/accessible/widgets/main.cpp | 13 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/widgets.json | 6 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp index 92cda9f3ca..ade4979256 100644 --- a/src/plugins/accessible/widgets/main.cpp +++ b/src/plugins/accessible/widgets/main.cpp @@ -172,12 +172,11 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec iface = new QAccessibleMenu(widget); #endif #ifndef QT_NO_ITEMVIEWS - } else if (classname == QLatin1String("QAbstractItemView")) { - if (qobject_cast<const QTreeView*>(widget)) { - iface = new QAccessibleTree(widget); - } else { - iface = new QAccessibleTable(widget); - } + } else if (classname == QLatin1String("QTreeView")) { + iface = new QAccessibleTree(widget); + } else if (classname == QLatin1String("QTableView") || classname == QLatin1String("QListView")) { + iface = new QAccessibleTable(widget); + // ### This should be cleaned up. We return the parent for the scrollarea to hide it. } else if (classname == QLatin1String("QWidget") && widget->objectName() == QLatin1String("qt_scrollarea_viewport") && qobject_cast<QAbstractItemView*>(widget->parentWidget())) { @@ -254,7 +253,7 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec } else if (classname == QLatin1String("QDesktopScreenWidget")) { iface = 0; - } else { + } else if (classname == QLatin1String("QWidget")) { iface = new QAccessibleWidget(widget); } diff --git a/src/plugins/accessible/widgets/widgets.json b/src/plugins/accessible/widgets/widgets.json index 094987daf5..3969fcd527 100644 --- a/src/plugins/accessible/widgets/widgets.json +++ b/src/plugins/accessible/widgets/widgets.json @@ -24,11 +24,12 @@ "QPlainTextEdit", "QMenuBar", "QMenu", - "QHeaderView", "QTabBar", "QToolBar", "QSizeGrip", - "QAbstractItemView", + "QListView", + "QTreeView", + "QTableView", "QWidget", "QSplitter", "QSplitterHandle", @@ -47,7 +48,6 @@ "QScrollArea", "QCalendarWidget", "QDockWidget", - "QAccessibleWidget", "QDesktopScreenWidget" ] } |