Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Oct 2010 01:11:16 +0000 (03:11 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Oct 2010 01:11:16 +0000 (03:11 +0200)
commitf2aa8bfcd3c5e94c72ad8da646a822fd032a4a11
treeb9d3d678c0d65109e224ab218079c83fe56dbb3f
parentef704ebad66559170d761459d42d6c99996db529
parent83ca0eda314bcc3938d7cd716c640a1db5911c97
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Phonon MMF backend: removed redundant trace output
  qmediaplayer: added command-line switch for initial volume
demos/qmediaplayer/mediaplayer.cpp