summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
commitcd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch)
tree8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/JavaScriptCore/JavaScriptCore.pro
parentd11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff)
downloadqtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r--Source/JavaScriptCore/JavaScriptCore.pro20
1 files changed, 7 insertions, 13 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
index cd3ab235f..393728f99 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/Source/JavaScriptCore/JavaScriptCore.pro
@@ -7,19 +7,13 @@
TEMPLATE = subdirs
CONFIG += ordered
-WTF.file = wtf/wtf.pro
-WTF.makefile = Makefile.WTF
-SUBDIRS += WTF
+derived_sources.file = DerivedSources.pri
+target.file = Target.pri
-!v8 {
- derived_sources.file = DerivedSources.pri
- target.file = Target.pri
+SUBDIRS += derived_sources target
- SUBDIRS += derived_sources target
+addStrictSubdirOrderBetween(derived_sources, target)
- addStrictSubdirOrderBetween(derived_sources, target)
-
- jsc.file = jsc.pro
- jsc.makefile = Makefile.jsc
- SUBDIRS += jsc
-}
+jsc.file = jsc.pro
+jsc.makefile = Makefile.jsc
+SUBDIRS += jsc