diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
| commit | f6c08f5e68c90338a8402c0912cd6be72e84b1e6 (patch) | |
| tree | d928f975e686b752cd1fc47eca812f376d9d0a03 /src/src.pro | |
| parent | 276a44c0867a76a90b425baa8dcbda733d25b3fb (diff) | |
| parent | 0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da (diff) | |
| download | Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.zip Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.tar.gz Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
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 63f50ba..40f744b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -124,7 +124,8 @@ src_declarative.target = sub-declarative src_declarative.depends = src_xml src_gui src_script src_network src_svg src_plugins.depends = src_gui src_sql src_svg contains(QT_CONFIG, webkit) { - src_webkit.depends = src_gui src_sql src_network src_xml + src_webkit.depends = src_gui src_sql src_network src_xml + contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore } contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support |