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, 13 Oct 2011 09:58:54 +0000 (19:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 13 Oct 2011 09:58:54 +0000 (19:58 +1000)
commit77563a2e63562e4e010e53dd79a707d9d7ed3f3d
tree3ce2dbe27a536250231c48cf45460cf0cc896be4
parent22d7b6c1afb3e8558941052b09f755cceb0a46fd
parent480b2f4c79160afaac7934936d3ae6ea382ae2bb
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:
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8