summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-11-18 10:02:21 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-11-18 10:15:59 (GMT)
commita5fd2b16e292546d9113fe1bdf844e7acfc21cd7 (patch)
tree03067e3c813a345263a42f4a18a2dfca0b4e749a
parentdb3efe5bf4d03d6fcdbf435c2445203bb07475f9 (diff)
downloadQt-a5fd2b16e292546d9113fe1bdf844e7acfc21cd7.zip
Qt-a5fd2b16e292546d9113fe1bdf844e7acfc21cd7.tar.gz
Qt-a5fd2b16e292546d9113fe1bdf844e7acfc21cd7.tar.bz2
Complement Phonon for Symbian documentation.
Reviewed-by: Gareth Stockwell
-rw-r--r--doc/src/platforms/platform-notes.qdoc8
-rw-r--r--src/plugins/phonon/phonon.pro4
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