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, 21 Apr 2011 03:54:51 +0000 (13:54 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 21 Apr 2011 03:54:51 +0000 (13:54 +1000)
commit5ec9501cd50d4094bf00ca81c75b7c8b763501ee
tree206b4c511e5bf8b4c3468a116f6791962f19d12c
parentc0b919de00def0ebbe478205285a9711e2a55159
parent92062a9af1dea35b9bdd781ee087755168ac1e77
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:
  QDeclarativeDebug: Fix typo in warning