Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Sep 2010 12:34:06 +0000 (14:34 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Sep 2010 12:34:06 +0000 (14:34 +0200)
commit2735bc6759f881c786a1097580a8682e3d28f365
treed16cbc4e32c4f4a2f5e49083400f9ab85831b09a
parent234751504f2703d39e562966431a54c015fb990e
parent688deeee6c8c2892becb4207f8c40dddba0e3769
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add missing license header
  Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
  Compile fix WinCE
  Ensure that we load system libraries from the correct location.