Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 8 Dec 2011 01:45:25 +0000 (11:45 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 8 Dec 2011 01:45:25 +0000 (11:45 +1000)
commit2acba36ac9943aed4ed7ea00453c185f76fdcf47
tree8b04ebe945a6963e4e7ad50c8806635ec6e7d376
parentf33b28d27a8e738fa93a45f44445d0fe255810b0
parent376343a9d14377ce8b9f92f9c3a35af267fce0ef
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  tests: make tests compile or disable those which don't compile