Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits)
  Improved support for OPTION and LINKEROPTION statements in MMP files
  Fix crash with QTextEdit::textChanged() when deleting a character
  econd half of the crash fix for codecs on Symbian
  Autotest: Use the file in the non-writeable area
  Autotest: moved these to the qtest/ dir
  Fix problem with accessibility clients not getting info from QFileDialog
  Fix a crash with global static objects
  Autotest: same as previous commit
  Autotest: fix network test failure
  Doc: we don't ship a qconfig executable in the Windows CE packages
  Enable preserved swap behavior when surface is created due to resize.
  Fixed possible data corruption in the triangulating stroker.
  Generate triggered signal even the action launches menu in Symbian.
  Symbian emulator: unload file server so apps can be recompiled.
  Clear QFontCache TLS content before nullifying TLS pointer.
  Fixed focus and window activation events on Symbian when opening menu.
  Fixed caching of QPainter patterns in the GL 2 engine.
  Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
  QTableView: fix spans corruption when removing spans.
  Fixes painting artifacts when scaling a QGraphicsProxyWidget.
  ...

1 files changed, 36 insertions, 0 deletions

diff --git a/src/gui/dialogs/qfiledialog.ui b/src/gui/dialogs/qfiledialog.ui
index b52bd8a..1f35abb 100644
--- a/src/gui/dialogs/qfiledialog.ui
+++ b/src/gui/dialogs/qfiledialog.ui
@@ -83,6 +83,12 @@
        <property name="toolTip" >
         <string>Back</string>
        </property>
+       <property name="accessibleName">
+        <string>Back</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Go back</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -90,6 +96,12 @@
        <property name="toolTip" >
         <string>Forward</string>
        </property>
+       <property name="accessibleName">
+        <string>Forward</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Go forward</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -97,6 +109,12 @@
        <property name="toolTip" >
         <string>Parent Directory</string>
        </property>
+       <property name="accessibleName">
+        <string>Parent Directory</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Go to the parent directory</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -104,6 +122,12 @@
        <property name="toolTip" >
         <string>Create New Folder</string>
        </property>
+       <property name="accessibleName">
+        <string>Create New Folder</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Create a New Folder</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -111,6 +135,12 @@
        <property name="toolTip" >
         <string>List View</string>
        </property>
+       <property name="accessibleName">
+        <string>List View</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Change to list view mode</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -118,6 +148,12 @@
        <property name="toolTip" >
         <string>Detail View</string>
        </property>
+       <property name="accessibleName">
+        <string>Detail View</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Change to detail view mode</string>
+       </property>
       </widget>
      </item>
     </layout>