Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Apr 2010 06:12:11 +0000 (08:12 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Apr 2010 06:12:11 +0000 (08:12 +0200)
commit02312c82024103f99affe5ad65c377cda99e1ff3
tree2620c00c552d2666579e705acbd92fb6d012751e
parent19a566f82a7c684423331a8caab70ec594afd1ce
parentf3e9ec546a811f31b4a0c934f0b1c6fa571fa020
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fix Phonon build with mingw.