From a5e191de57a86e6cf2d5836f2cc950046bfdabe9 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Thu, 17 Feb 2011 15:37:43 +0100
Subject: [PATCH] Window and Application fixes for accessibility.

Return app name instead of window title for root accessibility object.
Return Window as accessible type for the main window.

Reviewed-by: Jan-Arve
(cherry picked from commit 9a5b0d7a579572cd7e7faf869ab1a6684800f592)
---
 src/gui/accessible/qaccessibleobject.cpp      |  4 +-
 .../accessible/widgets/qaccessiblewidgets.cpp |  2 +-
 .../qaccessibility/tst_qaccessibility.cpp     | 37 +++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index 1d2d1da806..0cb2c08a3e 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -322,9 +322,7 @@ QString QAccessibleApplication::text(Text t, int) const
 {
     switch (t) {
     case Name:
-        if (QApplication::activeWindow())
-            return QApplication::activeWindow()->windowTitle();
-        break;
+        return QApplication::applicationName();
     case Description:
         return QApplication::applicationFilePath();
     default:
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index ca3f82776e..c9db1dcf01 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -1603,7 +1603,7 @@ void QAccessibleTextEdit::setAttributes(int startOffset, int endOffset, const QS
 
 #ifndef QT_NO_MAINWINDOW
 QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
-    : QAccessibleWidgetEx(widget, Application) { }
+    : QAccessibleWidgetEx(widget, Window) { }
 
 QVariant QAccessibleMainWindow::invokeMethodEx(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
 {
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index f82502eec9..6a35843ed1 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -245,6 +245,8 @@ private slots:
     void actionText();
     void doAction();
 
+    void applicationTest();
+    void mainWindowTest();
     void buttonTest();
     void sliderTest();
     void scrollBarTest();
@@ -1826,6 +1828,41 @@ void tst_QAccessibility::doAction()
 #endif
 }
 
+void tst_QAccessibility::applicationTest()
+{
+#ifdef QTEST_ACCESSIBILITY
+    QLatin1String name = QLatin1String("My Name");
+    qApp->setApplicationName(name);
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(qApp);
+    QCOMPARE(interface->text(QAccessible::Name, 0), name);
+    QCOMPARE(interface->role(0), QAccessible::Application);
+    delete interface;
+#else
+    QSKIP("Test needs accessibility support.", SkipAll);
+#endif
+}
+
+void tst_QAccessibility::mainWindowTest()
+{
+#ifdef QTEST_ACCESSIBILITY
+    QMainWindow mw;
+    mw.resize(300, 200);
+    mw.show(); // triggers layout
+
+    QLatin1String name = QLatin1String("I am the main window");
+    mw.setWindowTitle(name);
+    QTest::qWaitForWindowShown(&mw);
+
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&mw);
+    QCOMPARE(interface->text(QAccessible::Name, 0), name);
+    QCOMPARE(interface->role(0), QAccessible::Window);
+    delete interface;
+
+#else
+    QSKIP("Test needs accessibility support.", SkipAll);
+#endif
+}
+
 void tst_QAccessibility::buttonTest()
 {
 //#ifdef QTEST_ACCESSIBILITY