diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
| commit | dcf9a1f2f20248de0da9549af54bc3a4844eaf5b (patch) | |
| tree | c9eee3ff39000816113bcab3a5c035da97c2a9fc /src/plugins/plugins.pro | |
| parent | 47712d1f330e4b22ce6dd30e7557288ef7f7fca0 (diff) | |
| parent | 415951891cd75170f1e4b89b46effa3319b56e4e (diff) | |
| download | Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.zip Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.gz Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index afa0901..e778ab7 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,5 +13,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon -contains(QT_CONFIG, multimedia): SUBDIRS *= audio contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling |