Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 19:04:34 +0000 (05:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 19:04:34 +0000 (05:04 +1000)
commitb53ea893caf1626a1ebfd61545525d101f1c2833
treee6aacb72c25c6608819a774b3d61bbe7bdf727c6
parente5c522d4358bd6c9776c84c7fcfffb120d76725e
parent42b63e97fb2e7217472f4ad0685d531782e630e3
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:
  qmake: fix wrong case label in toString(subSystemOption)
  qt project files: create pkg-config files for mingw
  qmake: write and install pkg-config files for mingw
  qmake: don't limit pkg-config writing to unix generator
  qmake: fix double directory separator