Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 3 Aug 2010 03:15:37 +0000 (05:15 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 3 Aug 2010 03:15:37 +0000 (05:15 +0200)
commit3b043a6d5e839b2d90a2b4193e7768a23901308d
treecee2dd9827ab1357898f0ccc9fefb0c4abc9c554
parent105704d626f293f0c8fc08ef6978c401402148c6
parent1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed build break on Symbian versions earlier than S^3
  Enabled tst_mediaobject::testPlayFromResource on Symbian
  Added support to Phonon MMF backend for playback of Qt resource files
  Updated tst_mediaobject resource playback test cases
  Added support to Phonon MMF backend for playback of Qt resource files