Merge "Merge master into api_changes" into refs/staging/api_changes

1 files changed, 6 insertions, 26 deletions

diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 04b3645c87..be78cdbf14 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -2934,14 +2934,6 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem &
     for (int i = pos + count; i < viewItems.count(); i++)
         if (items[i].parentItem >= pos)
             items[i].parentItem += count;
-#ifndef QT_NO_ACCESSIBILITY
-#ifdef Q_OS_UNIX
-    if (QAccessible::isActive()) {
-        QAccessibleEvent event(QAccessible::TableModelChanged, q, 0);
-        QAccessible::updateAccessibility(&event);
-    }
-#endif
-#endif
 }
 
 void QTreeViewPrivate::removeViewItems(int pos, int count)
@@ -2953,14 +2945,6 @@ void QTreeViewPrivate::removeViewItems(int pos, int count)
     for (int i = pos; i < viewItems.count(); i++)
         if (items[i].parentItem >= pos)
             items[i].parentItem -= count;
-#ifndef QT_NO_ACCESSIBILITY
-#ifdef Q_OS_UNIX
-    if (QAccessible::isActive()) {
-        QAccessibleEvent event(QAccessible::TableModelChanged, q, 0);
-        QAccessible::updateAccessibility(&event);
-    }
-#endif
-#endif
 }
 
 #if 0
@@ -3769,16 +3753,10 @@ void QTreeView::currentChanged(const QModelIndex &current, const QModelIndex &pr
     }
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive() && current.isValid()) {
-#ifdef Q_OS_UNIX
         int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1;
-        QAccessibleEvent event(QAccessible::Focus, this, entry);
+        QAccessibleEvent event(this, QAccessible::Focus);
+        event.setChild(entry);
         QAccessible::updateAccessibility(&event);
-#else
-        int entry = visualIndex(current) + 1;
-        if (header())
-            ++entry;
-        QAccessible::updateAccessibility(viewport(), entry, QAccessible::Focus);
-#endif
     }
 #endif
 }
@@ -3797,14 +3775,16 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
         if (sel.isValid()) {
             int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1;
             Q_ASSERT(entry > 0);
-            QAccessibleEvent event(QAccessible::Selection, this, entry);
+            QAccessibleEvent event(this, QAccessible::Selection);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
             int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1;
             Q_ASSERT(entry > 0);
-            QAccessibleEvent event(QAccessible::SelectionRemove, this, entry);
+            QAccessibleEvent event(this, QAccessible::SelectionRemove);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
     }