diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 15:46:47 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 15:46:47 +0200 |
| commit | ad04d96fdac0fea252096d5144abf684516cbb10 (patch) | |
| tree | 50e9defb39955db39116677f2eef3d72e8053a26 /src/src.pro | |
| parent | 1200bf9f82860d2f391a4b68ce25c606eb9a0831 (diff) | |
| parent | bbaf34b1f5ac4e6d425eab183112b504b9ed4e83 (diff) | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/gui/painting/qpdf.cpp
Diffstat (limited to 'src/src.pro')
| -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 bdb7cd8006..b6fb3e73d9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -111,7 +111,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 |