Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1

5 files changed, 23 insertions, 36 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 8992a3bdfe..2ff039595a 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -1112,7 +1112,7 @@ void QAbstractItemView::reset()
 #ifdef Q_WS_X11
     if (QAccessible::isActive()) {
         QAccessible::queryAccessibleInterface(this)->table2Interface()->modelReset();
-        QAccessibleEvent event(QAccessible::TableModelChanged, this, 0);
+        QAccessibleEvent event(this, QAccessible::TableModelChanged);
         QAccessible::updateAccessibility(&event);
     }
 #endif
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 425eb4cd95..e82cd477c5 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -3172,8 +3172,10 @@ void QHeaderViewPrivate::resizeSections(QHeaderView::ResizeMode globalMode, bool
 void QHeaderViewPrivate::createSectionSpan(int start, int end, int size, QHeaderView::ResizeMode mode)
 {
     int sizePerSection = size / (end - start + 1);
-    if (end >= sectionSpans.count())
+    if (end >= sectionSpans.count()) {
         sectionSpans.resize(end + 1);
+        sectionStartposRecalc = true;
+    }
     SectionSpan *sectiondata = sectionSpans.data();
     for (int i = start; i <= end; ++i) {
         length += (sizePerSection - sectiondata[i].size);
@@ -3337,8 +3339,7 @@ void QHeaderViewPrivate::setDefaultSectionSize(int size)
     defaultSectionSize = size;
     for (int i = 0; i < sectionSpans.count(); ++i) {
         QHeaderViewPrivate::SectionSpan &span = sectionSpans[i];
-        if (span.size > 0) {
-            //we resize it if it is not hidden (ie size > 0)
+        if (sectionHidden.isEmpty() || !sectionHidden.testBit(i)) { // resize on not hidden.
             const int newSize = size;
             if (newSize != span.size) {
                 length += newSize - span.size; //the whole length is changed
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index efcff3f840..ea692f6f67 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -3145,7 +3145,8 @@ void QListView::currentChanged(const QModelIndex &current, const QModelIndex &pr
     if (QAccessible::isActive()) {
         if (current.isValid()) {
             int entry = visualIndex(current) + 1;
-            QAccessibleEvent event(QAccessible::Focus, this, entry);
+            QAccessibleEvent event(this, QAccessible::Focus);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
     }
@@ -3165,13 +3166,15 @@ void QListView::selectionChanged(const QItemSelection &selected,
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
             int entry = visualIndex(sel) + 1;
-            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) + 1;
-            QAccessibleEvent event(QAccessible::SelectionRemove, this, entry);
+            QAccessibleEvent event(this, QAccessible::SelectionRemove);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
     }
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 55cf18d78c..e997f7e9d6 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -3182,7 +3182,8 @@ void QTableView::currentChanged(const QModelIndex &current, const QModelIndex &p
         if (current.isValid()) {
             Q_D(QTableView);
             int entry = d->accessibleTable2Index(current);
-            QAccessibleEvent event(QAccessible::Focus, this, entry);
+            QAccessibleEvent event(this, QAccessible::Focus);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
     }
@@ -3204,13 +3205,15 @@ void QTableView::selectionChanged(const QItemSelection &selected,
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
             int entry = d->accessibleTable2Index(sel);
-            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 = d->accessibleTable2Index(desel);
-            QAccessibleEvent event(QAccessible::SelectionRemove, this, entry);
+            QAccessibleEvent event(this, QAccessible::SelectionRemove);
+            event.setChild(entry);
             QAccessible::updateAccessibility(&event);
         }
     }
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);
         }
     }