Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1

16 files changed, 74 insertions, 33 deletions

diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 0b24799a56..8c0bcc098f 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -644,7 +644,7 @@ void QAbstractButton::setText(const QString &text)
     update();
     updateGeometry();
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::NameChanged, this);
+    QAccessibleEvent event(this, QAccessible::NameChanged);
     QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -770,7 +770,7 @@ void QAbstractButton::setChecked(bool checked)
 #ifndef QT_NO_ACCESSIBILITY
     QAccessible::State s;
     s.checked = true;
-    QAccessibleStateChangeEvent event(s, this);
+    QAccessibleStateChangeEvent event(this, s);
     QAccessible::updateAccessibility(&event);
 #endif
 }
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 2d3f79e43d..c73da4e8c4 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -538,7 +538,7 @@ void QAbstractSlider::setValue(int value)
             emit sliderMoved((d->position = value));
     }
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::ValueChanged, this);
+    QAccessibleValueChangeEvent event(this, d->value);
     QAccessible::updateAccessibility(&event);
 #endif
     sliderChange(SliderValueChange);
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 7b55b0fa8c..8bab6a9a1d 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -976,7 +976,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
             }
         }
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::ValueChanged, this);
+        QAccessibleValueChangeEvent event(this, d->value);
         QAccessible::updateAccessibility(&event);
 #endif
         return;
@@ -1596,7 +1596,7 @@ void QAbstractSpinBoxPrivate::updateState(bool up, bool fromKeyboard /* = false
         buttonState = (up ? Up : Down) | (fromKeyboard ? Keyboard : Mouse);
         q->stepBy(up ? 1 : -1);
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::ValueChanged, q);
+        QAccessibleValueChangeEvent event(q, value);
         QAccessible::updateAccessibility(&event);
 #endif
     }
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 88c17ca704..dc1e0dbfab 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -983,7 +983,7 @@ void QComboBoxPrivate::_q_dataChanged(const QModelIndex &topLeft, const QModelIn
         q->update();
     }
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::NameChanged, q, 0);
+        QAccessibleEvent event(q, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -1240,7 +1240,7 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
     emit q->currentIndexChanged(index.row());
     emit q->currentIndexChanged(itemText(index));
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::NameChanged, q, 0);
+        QAccessibleEvent event(q, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -2589,7 +2589,7 @@ void QComboBox::clear()
     Q_D(QComboBox);
     d->model->removeRows(0, d->model->rowCount(d->root), d->root);
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::NameChanged, this, 0);
+        QAccessibleEvent event(this, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -2609,7 +2609,7 @@ void QComboBox::clearEditText()
     if (d->lineEdit)
         d->lineEdit->clear();
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::NameChanged, this, 0);
+        QAccessibleEvent event(this, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -2623,7 +2623,7 @@ void QComboBox::setEditText(const QString &text)
     if (d->lineEdit)
         d->lineEdit->setText(text);
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::NameChanged, this, 0);
+        QAccessibleEvent event(this, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
 #endif
 }
diff --git a/src/widgets/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp
index 29c213f7af..b69f65828b 100644
--- a/src/widgets/widgets/qframe.cpp
+++ b/src/widgets/widgets/qframe.cpp
@@ -486,7 +486,7 @@ void QFrame::paintEvent(QPaintEvent *)
 /*!
     \internal
 
-    Mostly for the sake of Q3Frame
+    Used by QLabel and QLCDNumber
  */
 void QFrame::drawFrame(QPainter *p)
 {
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index 7186ddfccc..e9edea286f 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -249,7 +249,7 @@ void QGroupBox::setTitle(const QString &title)
     update();
     updateGeometry();
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::NameChanged, this, 0);
+    QAccessibleEvent event(this, QAccessible::NameChanged);
     QAccessible::updateAccessibility(&event);
 #endif
 }
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index f36dea52dd..4450066df4 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -316,7 +316,7 @@ void QLabel::setText(const QString &text)
 
 #ifndef QT_NO_ACCESSIBILITY
     if (accessibleName().isEmpty()) {
-        QAccessibleEvent event(QAccessible::NameChanged, this, 0);
+        QAccessibleEvent event(this, QAccessible::NameChanged);
         QAccessible::updateAccessibility(&event);
     }
 #endif
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index 37e956c27f..6cee96e717 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -144,8 +144,9 @@ void QLineEditPrivate::_q_selectionChanged()
 
     emit q->selectionChanged();
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::TextSelectionChanged, q);
-    QAccessible::updateAccessibility(&event);
+    QAccessibleTextSelectionEvent ev(q, control->selectionStart(), control->selectionEnd());
+    ev.setCursorPosition(control->cursorPosition());
+    QAccessible::updateAccessibility(&ev);
 #endif
 }
 
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 7d4f7151a4..2abd4ceef7 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -1076,9 +1076,11 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e
 #ifndef QT_NO_ACCESSIBILITY
         if (QAccessible::isActive()) {
             int actionIndex = indexOf(action);
-            QAccessibleEvent focusEvent(QAccessible::Focus, q, actionIndex);
+            QAccessibleEvent focusEvent(q, QAccessible::Focus);
+            focusEvent.setChild(actionIndex);
             QAccessible::updateAccessibility(&focusEvent);
-            QAccessibleEvent selectionEvent(QAccessible::Selection, q, actionIndex);
+            QAccessibleEvent selectionEvent(q, QAccessible::Selection);
+            focusEvent.setChild(actionIndex);
             QAccessible::updateAccessibility(&selectionEvent);
         }
 #endif
@@ -1972,7 +1974,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     }
 
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::PopupMenuStart, this ,0);
+    QAccessibleEvent event(this, QAccessible::PopupMenuStart);
     QAccessible::updateAccessibility(&event);
 #endif
 }
@@ -2094,7 +2096,7 @@ void QMenu::hideEvent(QHideEvent *)
         d->eventLoop->exit();
     d->setCurrentAction(0);
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::PopupMenuEnd, this);
+    QAccessibleEvent event(this, QAccessible::PopupMenuEnd);
     QAccessible::updateAccessibility(&event);
 #endif
 #ifndef QT_NO_MENUBAR
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 2712839103..5ec41b8ba6 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -531,9 +531,11 @@ void QMenuBarPrivate::_q_actionHovered()
 #ifndef QT_NO_ACCESSIBILITY
         if (QAccessible::isActive()) {
             int actionIndex = actions.indexOf(action);
-            QAccessibleEvent focusEvent(QAccessible::Focus, q, actionIndex);
+            QAccessibleEvent focusEvent(q, QAccessible::Focus);
+            focusEvent.setChild(actionIndex);
             QAccessible::updateAccessibility(&focusEvent);
-            QAccessibleEvent selectionEvent(QAccessible::Selection, q, actionIndex);
+            QAccessibleEvent selectionEvent(q, QAccessible::Selection);
+            selectionEvent.setChild(actionIndex);
             QAccessible::updateAccessibility(&selectionEvent);
         }
 #endif //QT_NO_ACCESSIBILITY
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
index 9e1d3179c7..139f5703de 100644
--- a/src/widgets/widgets/qmenubar_p.h
+++ b/src/widgets/widgets/qmenubar_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-#ifndef QMAC_Q3MENUBAR_CPP_FILE
 #include "QtWidgets/qstyleoption.h"
 #include <private/qmenu_p.h> // Mac needs what in this file!
 
@@ -190,7 +189,6 @@ public:
     QAction *menuBarAction;
 #endif
 };
-#endif
 
 #endif // QT_NO_MENUBAR
 
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
index 0439caeb88..3e5b78fe2b 100644
--- a/src/widgets/widgets/qprogressbar.cpp
+++ b/src/widgets/widgets/qprogressbar.cpp
@@ -314,7 +314,7 @@ void QProgressBar::setValue(int value)
     d->value = value;
     emit valueChanged(value);
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::ValueChanged, this);
+    QAccessibleValueChangeEvent event(this, value);
     QAccessible::updateAccessibility(&event);
 #endif
     if (d->repaintRequired())
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 5dae4e0b34..291e3548a2 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -378,7 +378,7 @@ void QPushButton::setDefault(bool enable)
 #ifndef QT_NO_ACCESSIBILITY
     QAccessible::State s;
     s.defaultButton = true;
-    QAccessibleStateChangeEvent event(s, this);
+    QAccessibleStateChangeEvent event(this, s);
     QAccessible::updateAccessibility(&event);
 #endif
 }
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 2cc573e958..7b5b3b6559 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -1185,9 +1185,11 @@ void QTabBar::setCurrentIndex(int index)
         d->layoutTab(index);
 #ifndef QT_NO_ACCESSIBILITY
         if (QAccessible::isActive()) {
-            QAccessibleEvent focusEvent(QAccessible::Focus, this, index);
+            QAccessibleEvent focusEvent(this, QAccessible::Focus);
+            focusEvent.setChild(index);
             QAccessible::updateAccessibility(&focusEvent);
-            QAccessibleEvent selectionEvent(QAccessible::Selection, this, index);
+            QAccessibleEvent selectionEvent(this, QAccessible::Selection);
+            selectionEvent.setChild(index);
             QAccessible::updateAccessibility(&selectionEvent);
         }
 #endif
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 7c659ebb64..ca30c7eef8 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -552,6 +552,8 @@ void QWidgetLineControl::processInputMethodEvent(QInputMethodEvent *event)
                 }
                 selectionChange = true;
             } else {
+                if (m_selstart != m_selend)
+                    selectionChange = true;
                 m_selstart = m_selend = 0;
             }
             cursorPositionChanged = true;
@@ -768,8 +770,19 @@ void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edite
 
 #ifndef QT_NO_ACCESSIBILITY
     if (changed) {
-        QAccessibleEvent event(QAccessible::TextUpdated, parent());
-        QAccessible::updateAccessibility(&event);
+        if (oldText.isEmpty()) {
+            QAccessibleTextInsertEvent event(parent(), 0, txt);
+            event.setCursorPosition(m_cursor);
+            QAccessible::updateAccessibility(&event);
+        } else if (txt.isEmpty()) {
+            QAccessibleTextRemoveEvent event(parent(), 0, oldText);
+            event.setCursorPosition(m_cursor);
+            QAccessible::updateAccessibility(&event);
+        } else {
+            QAccessibleTextUpdateEvent event(parent(), 0, oldText, txt);
+            event.setCursorPosition(m_cursor);
+            QAccessible::updateAccessibility(&event);
+        }
     }
 #endif
 }
@@ -816,6 +829,10 @@ void QWidgetLineControl::internalInsert(const QString &s)
         addCommand(Command(SetSelection, m_cursor, 0, m_selstart, m_selend));
     if (m_maskData) {
         QString ms = maskString(m_cursor, s);
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessibleTextInsertEvent insertEvent(parent(), m_cursor, ms);
+        QAccessible::updateAccessibility(&insertEvent);
+#endif
         for (int i = 0; i < (int) ms.length(); ++i) {
             addCommand (Command(DeleteSelection, m_cursor + i, m_text.at(m_cursor + i), -1, -1));
             addCommand(Command(Insert, m_cursor + i, ms.at(i), -1, -1));
@@ -824,9 +841,17 @@ void QWidgetLineControl::internalInsert(const QString &s)
         m_cursor += ms.length();
         m_cursor = nextMaskBlank(m_cursor);
         m_textDirty = true;
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessibleTextCursorEvent event(parent(), m_cursor);
+        QAccessible::updateAccessibility(&event);
+#endif
     } else {
         int remaining = m_maxLength - m_text.length();
         if (remaining != 0) {
+#ifndef QT_NO_ACCESSIBILITY
+            QAccessibleTextInsertEvent insertEvent(parent(), m_cursor, s);
+            QAccessible::updateAccessibility(&insertEvent);
+#endif
             m_text.insert(m_cursor, s.left(remaining));
             for (int i = 0; i < (int) s.left(remaining).length(); ++i)
                addCommand(Command(Insert, m_cursor++, s.at(i), -1, -1));
@@ -854,6 +879,10 @@ void QWidgetLineControl::internalDelete(bool wasBackspace)
             addCommand(Command(SetSelection, m_cursor, 0, m_selstart, m_selend));
         addCommand(Command((CommandType)((m_maskData ? 2 : 0) + (wasBackspace ? Remove : Delete)),
                    m_cursor, m_text.at(m_cursor), -1, -1));
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessibleTextRemoveEvent event(parent(), m_cursor, m_text.at(m_cursor));
+        QAccessible::updateAccessibility(&event);
+#endif
         if (m_maskData) {
             m_text.replace(m_cursor, 1, clearString(m_cursor, 1));
             addCommand(Command(Insert, m_cursor, m_text.at(m_cursor), -1, -1));
@@ -891,6 +920,10 @@ void QWidgetLineControl::removeSelectedText()
             for (i = m_selend-1; i >= m_selstart; --i)
                 addCommand (Command(RemoveSelection, i, m_text.at(i), -1, -1));
         }
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessibleTextRemoveEvent event(parent(), m_selstart, m_text.mid(m_selstart, m_selend - m_selstart));
+        QAccessible::updateAccessibility(&event);
+#endif
         if (m_maskData) {
             m_text.replace(m_selstart, m_selend - m_selstart,  clearString(m_selstart, m_selend - m_selstart));
             for (int i = 0; i < m_selend - m_selstart; ++i)
@@ -1369,8 +1402,11 @@ void QWidgetLineControl::emitCursorPositionChanged()
         m_lastCursorPos = m_cursor;
         cursorPositionChanged(oldLast, m_cursor);
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::TextCaretMoved, parent());
-        QAccessible::updateAccessibility(&event);
+        // otherwise we send a selection update which includes the cursor
+        if (!hasSelectedText()) {
+            QAccessibleTextCursorEvent event(parent(), m_cursor);
+            QAccessible::updateAccessibility(&event);
+        }
 #endif
     }
 }
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 9eeffc1231..86dfb30389 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1829,7 +1829,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext(
 #if !defined(QT_NO_IM)
     Q_Q(QWidgetTextControl);
 
-    if (contextWidget && isPreediting()) {
+    if (isPreediting()) {
         QTextLayout *layout = cursor.block().layout();
         int cursorPos = q->hitTest(pos, Qt::FuzzyHit) - cursor.position();
 
@@ -1837,7 +1837,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext(
             cursorPos = -1;
 
         if (cursorPos >= 0) {
-            if (e->type() == QEvent::MouseButtonRelease)
+            if (eventType == QEvent::MouseButtonRelease)
                 qApp->inputMethod()->invokeAction(QInputMethod::Click, cursorPos);
 
             e->setAccepted(true);