Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 21 May 2011 13:57:00 +0000 (23:57 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 21 May 2011 13:57:00 +0000 (23:57 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add qmltestcase.prf for QtQuickTest


Trivial merge