Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 11 Apr 2010 20:38:31 +0000 (22:38 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 11 Apr 2010 20:38:31 +0000 (22:38 +0200)
commit053cc8df0e59561e083971a3ac99d4aaf0e86b1d
tree0ac80b1d4c1b43ae0df0c98513932244bfe56014
parent989b2d3a696781256de23a420d58466ab9c76836
parent2f1e7ef93b7faaedf55fddbad280e4aada9bfb9d
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  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