4 files changed, 18 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 9f7d66b344..70dcc5b506 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -53,6 +53,9 @@
 #include <qmenu.h>
 #include <qstyle.h>
 #include <qtimer.h>
+#ifndef QT_NO_ACCESSIBILITY
+#include <qaccessible.h>
+#endif
 #include "private/qtextdocumentlayout_p.h"
 #include "qtextdocument.h"
 #include "private/qtextdocument_p.h"
@@ -154,7 +157,7 @@ void QTextEditPrivate::init(const QString &html)
     QObject::connect(control, SIGNAL(redoAvailable(bool)), q, SIGNAL(redoAvailable(bool)));
     QObject::connect(control, SIGNAL(copyAvailable(bool)), q, SIGNAL(copyAvailable(bool)));
     QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
-    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
+    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged()));
 
     QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus()));
 
@@ -206,6 +209,16 @@ void QTextEditPrivate::_q_repaintContents(const QRectF &contentsRect)
     viewport->update(r);
 }
 
+void QTextEditPrivate::_q_cursorPositionChanged()
+{
+    Q_Q(QTextEdit);
+    emit q->cursorPositionChanged();
+#ifndef QT_NO_ACCESSIBILITY
+    QAccessibleTextCursorEvent event(q, q->textCursor().position());
+    QAccessible::updateAccessibility(&event);
+#endif
+}
+
 void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::MoveMode moveMode)
 {
     QTextCursor cursor = control->textCursor();
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
index 178aa7b907..5df44da4cf 100644
--- a/src/widgets/widgets/qtextedit.h
+++ b/src/widgets/widgets/qtextedit.h
@@ -304,6 +304,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_currentCharFormatChanged(const QTextCharFormat &))
     Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars())
     Q_PRIVATE_SLOT(d_func(), void _q_ensureVisible(const QRectF &))
+    Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged())
     friend class QTextEditControl;
     friend class QTextDocument;
     friend class QWidgetTextControl;
diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h
index d2dd81c13b..7038f16205 100644
--- a/src/widgets/widgets/qtextedit_p.h
+++ b/src/widgets/widgets/qtextedit_p.h
@@ -99,6 +99,7 @@ public:
     { control->processEvent(e, QPointF(horizontalOffset(), verticalOffset()), viewport); }
 
     void _q_currentCharFormatChanged(const QTextCharFormat &format);
+    void _q_cursorPositionChanged();
 
     void updateDefaultTextOption();
 
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index ba173dff81..768217c008 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -1583,6 +1583,8 @@ void tst_QAccessibility::textEditTest()
         edit.setTextCursor(c);
         QAccessibleTextSelectionEvent sel(&edit, 2, 4);
         QVERIFY_EVENT(&sel);
+        QAccessibleTextCursorEvent cursor(&edit, 4);
+        QVERIFY_EVENT(&cursor);
 
         edit.selectAll();
         int end = edit.textCursor().position();