diff options
| author | axis <qt-info@nokia.com> | 2010-10-04 10:54:40 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-10-04 10:54:40 (GMT) |
| commit | 82f4419d5d5a1c8bb18e823912ffa261b0704f8c (patch) | |
| tree | 7afd30a787fb2e6c33f5f0b2955c7e6f0b616848 /src | |
| parent | 207d9239dc6b67109b5e8cbdea7e5a589c167e85 (diff) | |
| parent | 4207bded6577f24fb4c20cc84880fd48eb9c0c9b (diff) | |
| download | Qt-82f4419d5d5a1c8bb18e823912ffa261b0704f8c.zip Qt-82f4419d5d5a1c8bb18e823912ffa261b0704f8c.tar.gz Qt-82f4419d5d5a1c8bb18e823912ffa261b0704f8c.tar.bz2 | |
Merge branch 'buildFixes' into 4.7-s60
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 9a8b70fc..060f48b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -119,7 +119,10 @@ src_webkit_declarative.target = sub-webkitdeclarative src_webkit.depends = src_gui src_sql src_network contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns src_imports.depends += src_webkit - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore + exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) { + src_webkit.depends += src_javascriptcore + src_javascriptcore.depends = src_corelib + } } contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support contains(QT_CONFIG, dbus):{ |