Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Apr 2011 02:41:30 +0000 (12:41 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Apr 2011 02:41:30 +0000 (12:41 +1000)
commita05f73499a187c67a394893e2cc74516ccbc46f5
tree9e7c3f8af63fa0983cf3d5f18540546e4cc20255
parentf9fce9b432bfcb5c2f48b2b34056a63bd805d8d3
parent5f741649cff218367100f3a9d7cdf9e0d393e327
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug