diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 19:06:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 19:06:31 (GMT) |
| commit | 0913d7f93bca190d4e0034e84ccf870195b540ba (patch) | |
| tree | 6f09789fd4a8970c815224b53434d4ef5bea6d72 /src | |
| parent | 175b4905c0cdd9d79baba2121cda2ac52ae547a7 (diff) | |
| parent | b4fc65e2bf9bdaafebbd070d7548c071ba282d65 (diff) | |
| download | Qt-0913d7f93bca190d4e0034e84ccf870195b540ba.zip Qt-0913d7f93bca190d4e0034e84ccf870195b540ba.tar.gz Qt-0913d7f93bca190d4e0034e84ccf870195b540ba.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix parallel builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index 0bf3b52..0908911 100644 --- a/src/src.pro +++ b/src/src.pro @@ -113,6 +113,7 @@ src_webkit_declarative.target = sub-webkitdeclarative src_declarative.depends = src_gui src_script src_network src_plugins.depends = src_gui src_sql src_svg contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia + contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs src_imports.depends = src_gui src_declarative |