diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 15:38:58 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 15:38:58 (GMT) |
| commit | 51955cb4ca94b2a700cb276714bec77bdb1bc934 (patch) | |
| tree | 11611a9648bbd24deb63554daac0f97b4747bdaf /src | |
| parent | 8cd7b92b890e392f830b626283c647e7e0118a23 (diff) | |
| parent | 72c8900e421ab4afd65b3752551a7fb857ca540f (diff) | |
| download | Qt-51955cb4ca94b2a700cb276714bec77bdb1bc934.zip Qt-51955cb4ca94b2a700cb276714bec77bdb1bc934.tar.gz Qt-51955cb4ca94b2a700cb276714bec77bdb1bc934.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 0d7404d..0573c2d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -18,13 +18,13 @@ 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 |