diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-24 14:10:44 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-24 14:10:44 (GMT) |
| commit | c81c60d2da17877754082f2d1d55e52a0e9c99cd (patch) | |
| tree | a01e37c26a089513c4277ccb0bd79a48639e50d9 /src/s60installs/s60installs.pro | |
| parent | f1a66bac8a64d81ce5e080fcfca334c7b56206d1 (diff) | |
| download | Qt-c81c60d2da17877754082f2d1d55e52a0e9c99cd.zip Qt-c81c60d2da17877754082f2d1d55e52a0e9c99cd.tar.gz Qt-c81c60d2da17877754082f2d1d55e52a0e9c99cd.tar.bz2 | |
Fix merge conflict: the file was renamed.
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 62661ed..88abc78 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -72,6 +72,13 @@ symbian: { codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs + contains(QT_CONFIG, phonon-backend) { + phonon_backend_plugins.sources += phonon_mmf.dll + + phonon_backend_plugins.path = $$QT_PLUGINS_BASE_DIR/phonon_backend + DEPLOYMENT += phonon_backend_plugins + } + DEPLOYMENT += qtresources qtlibraries imageformats_plugins codecs_plugins graphicssystems_plugins contains(QT_CONFIG, svg): { |