diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/JavaScriptCore/Target.pri | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/JavaScriptCore/Target.pri')
| -rw-r--r-- | Source/JavaScriptCore/Target.pri | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index ffd295a41..b0fcc16e7 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -30,8 +30,7 @@ include(yarr/yarr.pri) INSTALLDEPS += all -CONFIG(debug, debug|release): INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR\debug -CONFIG(release, debug|release): INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR\release +debug_and_release: INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig() SOURCES += \ API/JSBase.cpp \ @@ -60,8 +59,6 @@ SOURCES += \ bytecode/GetByIdStatus.cpp \ bytecode/JumpTable.cpp \ bytecode/LazyOperandValueProfile.cpp \ - bytecode/MethodCallLinkInfo.cpp \ - bytecode/MethodCallLinkStatus.cpp \ bytecode/MethodOfGettingAValueProfile.cpp \ bytecode/Opcode.cpp \ bytecode/PolymorphicPutByIdList.cpp \ @@ -72,6 +69,7 @@ SOURCES += \ bytecode/SpeculatedType.cpp \ bytecode/StructureStubClearingWatchpoint.cpp \ bytecode/StructureStubInfo.cpp \ + bytecode/UnlinkedCodeBlock.cpp \ bytecode/Watchpoint.cpp \ bytecompiler/BytecodeGenerator.cpp \ bytecompiler/NodesCodegen.cpp \ @@ -187,6 +185,7 @@ SOURCES += \ runtime/BooleanObject.cpp \ runtime/BooleanPrototype.cpp \ runtime/CallData.cpp \ + runtime/CodeCache.cpp \ runtime/CommonIdentifiers.cpp \ runtime/Completion.cpp \ runtime/ConstructData.cpp \ @@ -276,6 +275,18 @@ SOURCES += \ tools/CodeProfiling.cpp \ yarr/YarrJIT.cpp \ +linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { + SOURCES += \ + disassembler/UDis86Disassembler.cpp \ + disassembler/udis86/udis86.c \ + disassembler/udis86/udis86_decode.c \ + disassembler/udis86/udis86_input.c \ + disassembler/udis86/udis86_itab_holder.c \ + disassembler/udis86/udis86_syn-att.c \ + disassembler/udis86/udis86_syn-intel.c \ + disassembler/udis86/udis86_syn.c \ +} + HEADERS += $$files(*.h, true) *sh4* { |