summaryrefslogtreecommitdiffstats
path: root/src/plugins/plugins.pro
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@trolltech.com>2011-06-22 15:00:09 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2011-06-22 15:00:09 (GMT)
commit1b46b28ddac18fd0f5edc250218dfb15ac05e652 (patch)
tree57b0fe3414941d5deda54a7b658c7b3d2b0f2268 /src/plugins/plugins.pro
parent20ec7b41ac600fe670c3c8e6305cc12b10440c30 (diff)
parente4cce8849bf45be9a111072e3fca7bdf67364e8a (diff)
downloadQt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.zip
Qt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.tar.gz
Qt-1b46b28ddac18fd0f5edc250218dfb15ac05e652.tar.bz2
Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8
Diffstat (limited to 'src/plugins/plugins.pro')
-rw-r--r--src/plugins/plugins.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 2d0c201..94ce675 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -11,7 +11,6 @@ unix:!symbian {
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
!win32:!embedded:!mac:!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS *= inputmethods
!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
-symbian:SUBDIRS += s60
contains(QT_CONFIG, phonon): SUBDIRS *= phonon
qpa:SUBDIRS += platforms
contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling