diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 01:06:02 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 01:06:02 (GMT) |
commit | 4c0b6e0d0a5303861098f653e1c8e8823480ac82 (patch) | |
tree | 2529081b4f2d4e20f69bbb77435712db31765bb1 /src/plugins/plugins.pro | |
parent | c131c4d922bd381b44164673085fb83547375fd0 (diff) | |
parent | c9e07d69ec084a75fc083baecd46d0b8b422d1c4 (diff) | |
download | Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.zip Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.tar.gz Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml 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 418fd81..730fdc5 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -12,6 +12,5 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices -contains(QT_CONFIG, declarative): SUBDIRS *= qdeclarativemodules |