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.pri | |
| 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.pri')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index d465bcfea..daddf64ea 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -32,6 +32,9 @@ INCLUDEPATH += \ $$SOURCE_DIR/ForwardingHeaders \ $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR +# Pick up the right version of LLIntAssembly.h +macx:INCLUDEPATH+=$$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig() + win32-*: LIBS += -lwinmm wince* { |