diff options
| author | Andy Shaw <qt-info@nokia.com> | 2010-09-24 07:13:35 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2010-09-24 07:13:35 (GMT) |
| commit | c52224f8010bf90732e5b2ad6cef84f9bd248787 (patch) | |
| tree | cf27cb6d00c5b826e5ff38fa47667be61570da42 | |
| parent | 5e91a0a3add3b100fcae58eca7f700db12a456b4 (diff) | |
| download | Qt-c52224f8010bf90732e5b2ad6cef84f9bd248787.zip Qt-c52224f8010bf90732e5b2ad6cef84f9bd248787.tar.gz Qt-c52224f8010bf90732e5b2ad6cef84f9bd248787.tar.bz2 | |
Fix dependency on the plugins rule for multimedia
When configuring with -no-multimedia then the plugins rule should not
be depending on multimedia, otherwise it will not try and build any
plugins.
Task-number: QTBUG-13912
Reviewed-by: Rohan McGovern
| -rw-r--r-- | src/src.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index f856a0c..9a8b70fc 100644 --- a/src/src.pro +++ b/src/src.pro @@ -110,7 +110,8 @@ src_webkit_declarative.target = sub-webkitdeclarative contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl src_tools_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_gui src_script src_network - src_plugins.depends = src_gui src_sql src_svg src_multimedia + src_plugins.depends = src_gui src_sql src_svg + contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs src_imports.depends = src_gui src_declarative |