summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-10-04 07:34:07 (GMT)
committeraxis <qt-info@nokia.com>2010-10-04 10:53:37 (GMT)
commit77a92b39b30bf14f6509dfb578bad8511ef9a32e (patch)
tree9c1f82e33941e6a9a25f9f0dd5816a448d7c33ac
parent9dae9599c4d19ca55693df0b81bacbc1255ec733 (diff)
downloadQt-77a92b39b30bf14f6509dfb578bad8511ef9a32e.zip
Qt-77a92b39b30bf14f6509dfb578bad8511ef9a32e.tar.gz
Qt-77a92b39b30bf14f6509dfb578bad8511ef9a32e.tar.bz2
Made javascriptcore depend on corelib.
It lists "QT = core" in its profile, and may fail parallel builds if the dependency is not in place. RevBy: Benjamin Poulain
-rw-r--r--src/src.pro5
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):{