Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 1 Feb 2011 17:25:38 +0000 (03:25 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 1 Feb 2011 17:25:38 +0000 (03:25 +1000)
commit95b17fbe91eb3b1b0fcac92d8a8934769e4cd847
treeb5a1e5549a118ea5e4da612fc40d814ca2e9c401
parente5974b024828578945bd4c349f5f87f82a635225
parentbb84c5ef4f620af659395b66e6ed792a380b9a1f
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Don't ignore source-text when generating qsTrId translations for QML
  Fix a crash when undoing form layout