Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 1 Dec 2011 00:48:39 +0000 (10:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 1 Dec 2011 00:48:39 +0000 (10:48 +1000)
commitf122bdc3014e9db00a747ad58042314cd868a762
tree7df70d5049d76f0fe89a28e322e0c4a7beed4ce8
parentbb033b56ed2cd58fd51c891e759618cbe3b02c96
parente20eaed5c1968e32eca97cf449fa588cfab35a5d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix stack overwrite in QDBusDemarshaller
  Qt Linguist: Fix crashes
  fixed error generating wrong introspection string in header output file