Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 18 Oct 2011 17:20:55 +0000 (03:20 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 18 Oct 2011 17:20:55 +0000 (03:20 +1000)
commit8051a73be276995adfc4508a0cb5ad6451e8ab45
treeb740f82d2ecfdfaab9726c0bdf35df80681396ba
parent201db94dd24cf889a47fdeef89c1c5c4b94c44d2
parent2482191bfe660963825b404735811320a49f2b3f
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  qmake: fix writing of incremental linker option for vcxproj files