diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 02:20:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 02:20:39 (GMT) |
commit | 453498afa41a55351133e6d234d98b52b48b1388 (patch) | |
tree | 1fd55b98efceb4c9264e68ee1bab2df64c9fd91b /translations | |
parent | 9de173661019a5eb819ff75a43c1261a3b60e005 (diff) | |
parent | 38eb28d6d28506bfc50a69c6db517b9c51be385f (diff) | |
download | Qt-453498afa41a55351133e6d234d98b52b48b1388.zip Qt-453498afa41a55351133e6d234d98b52b48b1388.tar.gz Qt-453498afa41a55351133e6d234d98b52b48b1388.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
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
Diffstat (limited to 'translations')
0 files changed, 0 insertions, 0 deletions