Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 2 Jan 2012 16:18:46 +0000 (02:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 2 Jan 2012 16:18:46 +0000 (02:18 +1000)
commit828771056e96cd47d3eaf93db1b3d28c8624b332
treec070dd4f137b88baa3abe9af987ebf11f5749de7
parent7e29bc1d96e9508616e42f2deb3346f7daef6ce4
parent3bbfcb2e9b75b159da308373f24d5b9869162a9a
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:
  Adapt autotests to commit e2773a9
  Declarative: Use qDebug() for debugger status updates
  Declarative: Unify output of warning messages in debug server