diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-24 10:26:49 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-24 11:39:56 (GMT) |
| commit | 6a297d3626c1779047812965a12f32e143e63b7d (patch) | |
| tree | c904695044fc6975d9508d2393a42299749804d3 /src/src.pro | |
| parent | 47975b0ede04dc63ebef2ff631520648fc3fa474 (diff) | |
| download | Qt-6a297d3626c1779047812965a12f32e143e63b7d.zip Qt-6a297d3626c1779047812965a12f32e143e63b7d.tar.gz Qt-6a297d3626c1779047812965a12f32e143e63b7d.tar.bz2 | |
Fixed compile of QtDeclarative with aggressively parallel builds.
QtDeclarative depends on QtWebKit. qmake has to be told about this
or it might try to link QtDeclarative to QtWebKit before it has been
built.
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/src.pro')
| -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 40f744b..f7ace8d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -126,6 +126,7 @@ src_declarative.target = sub-declarative contains(QT_CONFIG, webkit) { src_webkit.depends = src_gui src_sql src_network src_xml contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon + contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore } contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support |