5 files changed, 43 insertions, 42 deletions
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index fc969e17380..265c523eae0 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -60,7 +60,7 @@ int QAccessibleTable::logicalIndex(const QModelIndex &index) const
 }
 
 QAccessibleTable::QAccessibleTable(QWidget *w)
-    : QAccessibleObject(w)
+    : QAccessibleWidgetV2(w)
 {
     Q_ASSERT(view());
 
@@ -677,7 +677,7 @@ void *QAccessibleTable::interface_cast(QAccessible::InterfaceType t)
        return static_cast<QAccessibleSelectionInterface*>(this);
     if (t == QAccessible::TableInterface)
        return static_cast<QAccessibleTableInterface*>(this);
-   return nullptr;
+    return QAccessibleWidgetV2::interface_cast(t);
 }
 
 void QAccessibleTable::modelChange(QAccessibleTableModelChangeEvent *event)
diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
index 9b30f36ced3..79f9a7f2f05 100644
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@@ -31,7 +31,9 @@ QT_BEGIN_NAMESPACE
 class QAccessibleTableCell;
 class QAccessibleTableHeaderCell;
 
-class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleSelectionInterface, public QAccessibleObject
+class QAccessibleTable : public QAccessibleTableInterface,
+                         public QAccessibleSelectionInterface,
+                         public QAccessibleWidgetV2
 {
 public:
     explicit QAccessibleTable(QWidget *w);
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 608a99b575d..cd28a61f427 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -958,54 +958,22 @@ QPoint QAccessibleTextWidget::scrollBarPosition() const
 QString QAccessibleTextWidget::textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType,
                                                 int *startOffset, int *endOffset) const
 {
-    Q_ASSERT(startOffset);
-    Q_ASSERT(endOffset);
-
-    QTextCursor cursor = textCursor();
-    cursor.setPosition(offset);
-    std::pair<int, int> boundaries = QAccessible::qAccessibleTextBoundaryHelper(cursor, boundaryType);
-    cursor.setPosition(boundaries.first - 1);
-    boundaries = QAccessible::qAccessibleTextBoundaryHelper(cursor, boundaryType);
-
-    *startOffset = boundaries.first;
-    *endOffset = boundaries.second;
-
-    return text(boundaries.first, boundaries.second);
- }
-
+    return qt_accTextBeforeOffsetHelper(*this, textCursor(), offset, boundaryType, startOffset,
+                                        endOffset);
+}
 
 QString QAccessibleTextWidget::textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType,
                                               int *startOffset, int *endOffset) const
 {
-    Q_ASSERT(startOffset);
-    Q_ASSERT(endOffset);
-
-    QTextCursor cursor = textCursor();
-    cursor.setPosition(offset);
-    std::pair<int, int> boundaries = QAccessible::qAccessibleTextBoundaryHelper(cursor, boundaryType);
-    cursor.setPosition(boundaries.second);
-    boundaries = QAccessible::qAccessibleTextBoundaryHelper(cursor, boundaryType);
-
-    *startOffset = boundaries.first;
-    *endOffset = boundaries.second;
-
-    return text(boundaries.first, boundaries.second);
+    return qt_accTextAfterOffsetHelper(*this, textCursor(), offset, boundaryType, startOffset,
+                                       endOffset);
 }
 
 QString QAccessibleTextWidget::textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType,
                                             int *startOffset, int *endOffset) const
 {
-    Q_ASSERT(startOffset);
-    Q_ASSERT(endOffset);
-
-    QTextCursor cursor = textCursor();
-    cursor.setPosition(offset);
-    std::pair<int, int> boundaries = QAccessible::qAccessibleTextBoundaryHelper(cursor, boundaryType);
-
-    *startOffset = boundaries.first;
-    *endOffset = boundaries.second;
-
-    return text(boundaries.first, boundaries.second);
+    return qt_accTextAtOffsetHelper(*this, textCursor(), offset, boundaryType, startOffset,
+                                    endOffset);
 }
 
 void QAccessibleTextWidget::setCursorPosition(int position)
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index 741a1589851..1f7b20833dd 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -65,6 +65,16 @@ QAccessibleInterface *QAccessibleAbstractSpinBox::lineEditIface() const
 #endif
 }
 
+QAccessible::State QAccessibleAbstractSpinBox::state() const
+{
+    QAccessible::State state = QAccessibleWidgetV2::state();
+    if (abstractSpinBox()->isReadOnly())
+        state.readOnly = true;
+    else
+        state.editable = true;
+    return state;
+}
+
 QString QAccessibleAbstractSpinBox::text(QAccessible::Text t) const
 {
     if (t == QAccessible::Value)
@@ -338,6 +348,22 @@ void *QAccessibleAbstractSlider::interface_cast(QAccessible::InterfaceType t)
     return QAccessibleWidgetV2::interface_cast(t);
 }
 
+QList<QAccessible::Attribute> QAccessibleAbstractSlider::attributeKeys() const
+{
+    QList<QAccessible::Attribute> keys = QAccessibleWidgetV2::attributeKeys();
+    keys.append(QAccessible::Attribute::Orientation);
+
+    return keys;
+}
+
+QVariant QAccessibleAbstractSlider::attributeValue(QAccessible::Attribute key) const
+{
+    if (key == QAccessible::Attribute::Orientation)
+        return QVariant::fromValue(abstractSlider()->orientation());
+
+    return QAccessibleWidgetV2::attributeValue(key);
+}
+
 QVariant QAccessibleAbstractSlider::currentValue() const
 {
     return abstractSlider()->value();
diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h
index 23482556f42..5a023d2f00b 100644
--- a/src/widgets/accessible/rangecontrols_p.h
+++ b/src/widgets/accessible/rangecontrols_p.h
@@ -42,6 +42,7 @@ public:
     explicit QAccessibleAbstractSpinBox(QWidget *w);
     virtual ~QAccessibleAbstractSpinBox();
 
+    QAccessible::State state() const override;
     QString text(QAccessible::Text t) const override;
     void *interface_cast(QAccessible::InterfaceType t) override;
 
@@ -114,6 +115,10 @@ public:
     explicit QAccessibleAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider);
     void *interface_cast(QAccessible::InterfaceType t) override;
 
+    // QAccessibleAttributesInterface
+    QList<QAccessible::Attribute> attributeKeys() const override;
+    QVariant attributeValue(QAccessible::Attribute key) const override;
+
     // QAccessibleValueInterface
     QVariant currentValue() const override;
     void setCurrentValue(const QVariant &value) override;