diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-11-18 10:02:21 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-19 03:19:30 (GMT) |
commit | 5b68897c25cfab4139964df278d94a58047731ce (patch) | |
tree | 8b3f5eb74a1c0514272f9b55eb225979b8fb30b6 | |
parent | d046f7dcf06d8770ac844df702445bf94811b6fa (diff) | |
download | Qt-5b68897c25cfab4139964df278d94a58047731ce.zip Qt-5b68897c25cfab4139964df278d94a58047731ce.tar.gz Qt-5b68897c25cfab4139964df278d94a58047731ce.tar.bz2 |
Complement Phonon for Symbian documentation.
Reviewed-by: Gareth Stockwell
(cherry picked from commit e5f0b9568e969b55d0f3a84b6fc5d5f0de8d3f1f)
-rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 8 | ||||
-rw-r--r-- | src/plugins/phonon/phonon.pro | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 9896b08..c7477bc 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -416,7 +416,7 @@ \section1 Multimedia and Phonon Support - Qt provides a backend for Qt's multimedia module, Phonon, which supports + Qt provides a backend for Qt's Phonon module, which supports video and sound playback through Symbian's Multimedia Framework, MMF. In this release the support is experimental. Video playback may have @@ -429,7 +429,11 @@ In addition, there exists a backend for the Helix framework. However, due to it not shipping with Qt, its availability depends on the Symbian - platform in use. If available, it is loaded instead of the MMF plugin. + platform in use. If available, it is loaded in preference over the MMF + plugin. The Helix plugin requires Symbian signed capabilities. If the + application does not have those capabilities, the MMF plugin, if present on + the device, will be loaded instead. The capabilities the Helix backend + requires are AllFiles, DiskAdmin and MultimediaDD. */ diff --git a/src/plugins/phonon/phonon.pro b/src/plugins/phonon/phonon.pro index 814a062..803d8f9 100644 --- a/src/plugins/phonon/phonon.pro +++ b/src/plugins/phonon/phonon.pro @@ -7,4 +7,8 @@ mac:contains(QT_CONFIG, phonon-backend): SUBDIRS *= qt7 win32:!wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= ds9 wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= waveout wince*:contains(QT_CONFIG, directshow): SUBDIRS *= ds9 + +# Note that the MMF backend is in some scenarios an important complement to the +# Helix backend: the latter requires Symbian signed capabilities, hence MMF +# provides multimedia for self signed scenarios. symbian:contains(QT_CONFIG, phonon-backend): SUBDIRS *= mmf |