Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 4 Apr 2010 15:15:32 +0000 (17:15 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 4 Apr 2010 15:15:32 +0000 (17:15 +0200)
commit4a1eb8206cb0be62911c0606e55af0bdd70a0b94
tree257aff339b29f8dc9dbdcff009588dd3d7fe1909
parentd6c9b45f5979d6b99b1078db38d6ae402fb4332c
parent7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Attempt at fixing Phonon build issue on Symbian.