diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
| commit | cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709 (patch) | |
| tree | 37a16ff73fe102ac0cd169b20f9b12135903d33a /src/src.pro | |
| parent | 5305831c3b0d58a61efadc1c1d3ce9ce4d6e8c77 (diff) | |
| parent | b9a924a1e77faeeba595d0619afb14e8fdbb2dd4 (diff) | |
| download | Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.zip Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.tar.gz Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic 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 |