summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-07-09 08:57:21 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-07-09 09:08:19 (GMT)
commitb9696905fd62b5cf66392cd9f6757d4ae97a87db (patch)
tree067d22399f900fed88088cc4fd2d9160f2bfe9c5 /src/plugins
parente56b1cc5e154801c0483a4fb31c125aee3382c48 (diff)
downloadQt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.zip
Qt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.tar.gz
Qt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.tar.bz2
Tweak deployment rules after addition of OpenVG.
Ensure that we build the plugins we need and also clean up the file a bit to remove the symbian specific blocks that aren't needed. Also we no longer need a separate .iby file for deploying the VG graphics system since it is now nicely integrated into Qt.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/plugins.pro5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index c08056e..a8981db 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
+!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
contains(QT_CONFIG, phonon): SUBDIRS *= phonon
-symbian:SUBDIRS = imageformats codecs iconengines s60 sqldrivers