Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 14:34:33 +0000 (00:34 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 14:34:33 +0000 (00:34 +1000)
commit7e4a9187bb11b794e45d95d2e9fae026d6b0d07d
treeccaeb1246555d2e508e6663ba469ced06f79bb72
parentfa976feb9408ebaa12570997471f63683bdb88a2
parent21711d7ad54b0ee83e776ac3ad83121221fdf24b
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.