Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (22 commits)
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Improve sbsv2 whatlog support.
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index d452820f9c..d24f52f37d 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -2531,6 +2531,12 @@ void tst_QAccessibility::menuTest()
     QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 4), QString());
     QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 5), QString("Execute"));
 
+    // QTBUG-21578 - after setting accessible name on a menu it would no longer
+    // return the right names for it's children.
+    QCOMPARE(interface->text(QAccessible::Name, 1), QString("New..."));
+    file->setAccessibleName("File");
+    QCOMPARE(interface->text(QAccessible::Name, 1), QString("New..."));
+
     QAccessibleInterface *iface = 0;
     QAccessibleInterface *iface2 = 0;