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)
commit0e7af4386b24ab32d3d99a128fa46bb81e4d9fa0
tree3779e5628c96aec9fd5364cc818d72bfb4f8c673
parentd3b376865e33c91040325a2e6e74e94b09c8dd6b
parent035d6b9188f25d2d70c8a47b62babaf168bc38dd
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add qmltestcase.prf for QtQuickTest