summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-03-29 18:44:28 +0200
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-04-06 12:23:34 +0200
commit4b27d0d887269583a0f76e922948f8c25e96ab88 (patch)
tree6691a238abb4bdc8e85ed7ff1debecdb49992995 /src/src.pro
parentaf60a29d79bca27dde9441b6b8fc0eae185f08d5 (diff)
QtWebKit: Re-add the dependency to the static linked JavaScriptCore
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 6ccd955258..d5d0ddfe8e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -24,7 +24,7 @@ contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns
contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon
contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
contains(QT_CONFIG, webkit) {
- #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore
+ 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
@@ -122,7 +122,7 @@ src_declarative.target = sub-declarative
contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
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
}
contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
contains(QT_CONFIG, dbus):{