Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 14 Oct 2011 21:35:55 +0000 (07:35 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 14 Oct 2011 21:35:55 +0000 (07:35 +1000)
commitbb47d070b0ad0cccd3a60b6344292f97164c9231
treeea99a9190065b35af5446dfadad497f65f686ab0
parent94d0bed992aad8e8a6edda129d4a75f9b4ffa163
parentd2c7193107a170e2884db52272f4d0ee0da62856
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:
  support the obj-c #import statement in the dependency generator