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 20:56:21 +0000 (22:56 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 4 Apr 2010 20:56:21 +0000 (22:56 +0200)
commitdb9bfd3653de23693db67ec5a0534e4d4ac97f7d
tree85cc9bd4a08e839670494a68eb9a320249922e08
parent4a1eb8206cb0be62911c0606e55af0bdd70a0b94
parentf3132cba7af8a5325884c3c04eea7b2940863a78
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:
  Revert "Attempt at fixing Phonon build issue on Symbian."