Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Sep 2011 00:33:38 +0000 (10:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Sep 2011 00:33:38 +0000 (10:33 +1000)
commit367a89cf5cb1282d2e966c83869a56fd22745779
tree75983b6d38d31129ff4662248a587cf8ce6dc58e
parent3a7e23ef51b6099fc6dcfca36e04ec61bfa4337b
parent0d0c1082f74888044713d96deca2d510951d018a
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:
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE