diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 15:18:58 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 15:18:58 +0200 |
| commit | 9ecd67ee21ededfbd262279ebdb73324540f5df4 (patch) | |
| tree | 5387e993b3befdf6255b9cf2b724189f11e73738 /src/src.pro | |
| parent | bd337d251a3ff54c6845f1c4469ec7c99068971e (diff) | |
| parent | 3555687f5ff270c61499a5597444895bec0d70fb (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index b8cd0ae4d2..9ebe94b991 100644 --- a/src/src.pro +++ b/src/src.pro @@ -20,15 +20,16 @@ contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg +contains(QT_CONFIG, script): SRC_SUBDIRS += src_script +contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative contains(QT_CONFIG, webkit) { exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } -contains(QT_CONFIG, script): SRC_SUBDIRS += src_script !contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools -contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative SRC_SUBDIRS += src_plugins contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports +contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative # s60installs need to be at the end, because projects.pro does an ordered build, # and s60installs depends on all the others. @@ -84,6 +85,8 @@ src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative +src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative +src_webkit_declarative.target = sub-webkitdeclarative #CONFIG += ordered !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { @@ -135,6 +138,7 @@ src_declarative.target = sub-declarative contains(QT_CONFIG, svg) { src_declarative.depends += src_svg } + contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit } |