diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-19 09:40:11 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-19 09:40:11 (GMT) |
| commit | e8d2c7b0b54806ff4e2127e7ddf3c7800bb0a429 (patch) | |
| tree | 4f0f11a6655dd883ee133f95fe5158fb71c2eed8 /src/plugins | |
| parent | d2c337d33d02f91b02dfb6f378a3cd42a33d01cc (diff) | |
| parent | ea3ba57cf80954ca11e1c446181f6cee3656ce3e (diff) | |
| download | Qt-e8d2c7b0b54806ff4e2127e7ddf3c7800bb0a429.zip Qt-e8d2c7b0b54806ff4e2127e7ddf3c7800bb0a429.tar.gz Qt-e8d2c7b0b54806ff4e2127e7ddf3c7800bb0a429.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/phonon/phonon.pro | 4 |
1 files changed, 4 insertions, 0 deletions
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 |