Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index ee49d679f0..977013ab8c 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -1589,6 +1589,22 @@ void tst_QAccessibility::textEditTest()
     iface->editableTextInterface()->cutText(12, 16);
     QCOMPARE(QApplication::clipboard()->text(), QLatin1String("how "));
     QCOMPARE(iface->textInterface()->text(12, 15), QLatin1String("are"));
+
+    QTestAccessibility::clearEvents();
+
+    // select text
+    QTextCursor c = edit.textCursor();
+    c.setPosition(2);
+    c.setPosition(4, QTextCursor::KeepAnchor);
+    edit.setTextCursor(c);
+    QAccessibleTextSelectionEvent sel(&edit, 2, 4);
+    QVERIFY_EVENT(&sel);
+
+    edit.selectAll();
+    int end = edit.textCursor().position();
+    sel.setCursorPosition(end);
+    sel.setSelection(0, end);
+    QVERIFY_EVENT(&sel);
     }
     QTestAccessibility::clearEvents();
 }
@@ -1922,7 +1938,6 @@ void tst_QAccessibility::lineEditTest()
     QVERIFY_EVENT(&cursor);
 
     lineEdit->setText("foo");
-    qDebug() << QTestAccessibility::events();
     cursorEvent.setCursorPosition(3);
     QVERIFY_EVENT(&cursorEvent);