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>
Sun, 10 Oct 2010 19:44:01 +0000 (21:44 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 19:44:01 +0000 (21:44 +0200)
commit79f20ff18232f5b9a8df061a74b08948dadb7b8b
treee80392dede2042da4275b718ee8622c3c9fe90ad
parent46822d7091ef05e64e363e7209ea3e613e4d386d
parent71af72bc037db6bac023bf9a0bbf6032c06b2d29
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:
  Added qmake check for presence of RHttpDownloadMgr header
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers