Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 Aug 2010 14:19:47 +0000 (16:19 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 Aug 2010 14:19:47 +0000 (16:19 +0200)
commitf53a7044920409f57bc466631450dd77bea7b5b4
treefdf35b251602ef5b4515b20cb3df60212ac6c332
parent35abe608440f2effd330fd213955e391c4a412a2
parentf087ad801b19ffa32a538269cd1475ead963f013
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qmake: fix assertion on Windows when DESTDIR is empty in static libs