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>
Fri, 8 Apr 2011 12:32:31 +0000 (22:32 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Apr 2011 12:32:31 +0000 (22:32 +1000)
commitc392cb990ea27e4fa81683b3b2bcae844fad3039
tree049be4a7846a88a77a365d9e1f62e995698990fd
parent75fd46451cabd680d16913d5dfd4733c09db3459
parent688d6db785af821e76b9e436ef9d9cbea95ef5ad
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:
  make -markuntranslated work without -idbased
  fix conditional on shell type