diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-07-21 04:18:57 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-07-21 04:18:57 (GMT) |
| commit | 6b1487b5df04e30b92a2639340928d64c08cb72f (patch) | |
| tree | 8109961850f82c76b1b6fd4967dde78259ced21f /src/plugins/plugins.pro | |
| parent | 127c93b8ab606740fa9c59de9ce6d10de91af412 (diff) | |
| parent | 9324fddeb081a5f1cef9229d15a7799df17d02fa (diff) | |
| download | Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.zip Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.tar.gz Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.tar.bz2 | |
Merge commit 'origin/master' into topic/mmfphonon
Conflicts:
src/plugins/plugins.pro
src/s60installs/qt.iby
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 7fb1886..590aaf7 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,13 +1,12 @@ TEMPLATE = subdirs SUBDIRS *= accessible imageformats sqldrivers iconengines script -unix { +unix:!symbian { contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs } else { SUBDIRS *= codecs } !embedded:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -!win32:!embedded:!mac:SUBDIRS *= inputmethods -symbian:SUBDIRS = imageformats codecs iconengines s60 sqldrivers +symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon |