diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2012-12-01 02:11:16 +0100 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@gmail.com> | 2012-12-01 03:17:34 +0100 |
commit | b71580caec90bb8c4f0193b131b608e49003ba63 (patch) | |
tree | c3c7c6588dbde32e36c44b3275dbca0ae366582c /Source/JavaScriptCore/JavaScriptCore.pro | |
parent | 6fd3f75fc3899e100984cc3f495bf9de00bc4358 (diff) | |
download | qtwebkit-b71580caec90bb8c4f0193b131b608e49003ba63.tar.gz |
Re-enable LLInt on mac with the proper fix
Also update the Changelog for the PluginProcess change to try and
be in line with what happened in trunk.
Change-Id: I50445af940080abcab523b158d90af4f012f812f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pro | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro index 006d6155a..13130b87f 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pro +++ b/Source/JavaScriptCore/JavaScriptCore.pro @@ -7,18 +7,16 @@ TEMPLATE = subdirs CONFIG += ordered -!macx { - LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro - LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor - SUBDIRS += LLIntOffsetsExtractor -} +LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro +LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor +SUBDIRS += LLIntOffsetsExtractor derived_sources.file = DerivedSources.pri target.file = Target.pri SUBDIRS += derived_sources target -!macx:addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) +addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) addStrictSubdirOrderBetween(derived_sources, target) jsc.file = jsc.pro |