diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
| commit | 4cd7180ad3365c0e8eef8a22c825f3289a799ab0 (patch) | |
| tree | e383d24055eb86e8b128d20517f5a0e0529eea8a /src/plugins/plugins.pro | |
| parent | 1e08ccc646e4f07fd560c901ff7b56626ed98d1e (diff) | |
| parent | 3368eea602d394812283d437b5e9d786e1af64e3 (diff) | |
| download | Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.zip Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.gz Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.bz2 | |
Merge branch 'master' into topic/mmfphonon
Conflicts:
src/3rdparty/phonon/phonon/factory.cpp
src/s60installs/qt_libs.pro
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 590aaf7..db2e534 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -10,3 +10,4 @@ unix:!symbian { embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon +contains(QT_CONFIG, multimedia): SUBDIRS *= audio |