Say hello to QtV4 module.

Change-Id: I507cd5707b7d7223a0d901cf939896fb2649b684
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

219 files changed, 183 insertions, 62 deletions

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 0000000000..42ba8e45fb
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+load(qt_build_config)
diff --git a/3rdparty/double-conversion/README b/src/3rdparty/double-conversion/README
index 40ed4a7efd..40ed4a7efd 100644
--- a/3rdparty/double-conversion/README
+++ b/src/3rdparty/double-conversion/README
diff --git a/3rdparty/double-conversion/bignum-dtoa.cc b/src/3rdparty/double-conversion/bignum-dtoa.cc
index b6c2e85d17..b6c2e85d17 100644
--- a/3rdparty/double-conversion/bignum-dtoa.cc
+++ b/src/3rdparty/double-conversion/bignum-dtoa.cc
diff --git a/3rdparty/double-conversion/bignum-dtoa.h b/src/3rdparty/double-conversion/bignum-dtoa.h
index 34b961992d..34b961992d 100644
--- a/3rdparty/double-conversion/bignum-dtoa.h
+++ b/src/3rdparty/double-conversion/bignum-dtoa.h
diff --git a/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc
index 747491a089..747491a089 100644
--- a/3rdparty/double-conversion/bignum.cc
+++ b/src/3rdparty/double-conversion/bignum.cc
diff --git a/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h
index 5ec3544f57..5ec3544f57 100644
--- a/3rdparty/double-conversion/bignum.h
+++ b/src/3rdparty/double-conversion/bignum.h
diff --git a/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc
index c676429194..c676429194 100644
--- a/3rdparty/double-conversion/cached-powers.cc
+++ b/src/3rdparty/double-conversion/cached-powers.cc
diff --git a/3rdparty/double-conversion/cached-powers.h b/src/3rdparty/double-conversion/cached-powers.h
index 61a50614cf..61a50614cf 100644
--- a/3rdparty/double-conversion/cached-powers.h
+++ b/src/3rdparty/double-conversion/cached-powers.h
diff --git a/3rdparty/double-conversion/diy-fp.cc b/src/3rdparty/double-conversion/diy-fp.cc
index ddd1891b16..ddd1891b16 100644
--- a/3rdparty/double-conversion/diy-fp.cc
+++ b/src/3rdparty/double-conversion/diy-fp.cc
diff --git a/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h
index 9dcf8fbdba..9dcf8fbdba 100644
--- a/3rdparty/double-conversion/diy-fp.h
+++ b/src/3rdparty/double-conversion/diy-fp.h
diff --git a/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc
index a79fe92d22..a79fe92d22 100644
--- a/3rdparty/double-conversion/double-conversion.cc
+++ b/src/3rdparty/double-conversion/double-conversion.cc
diff --git a/3rdparty/double-conversion/double-conversion.h b/src/3rdparty/double-conversion/double-conversion.h
index f98edae75a..f98edae75a 100644
--- a/3rdparty/double-conversion/double-conversion.h
+++ b/src/3rdparty/double-conversion/double-conversion.h
diff --git a/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri
index 9a9a2b89d8..8bb37c63e9 100644
--- a/3rdparty/double-conversion/double-conversion.pri
+++ b/src/3rdparty/double-conversion/double-conversion.pri
@@ -1,3 +1,4 @@
+INCLUDEPATH += $PWD
 VPATH += $$PWD
 SOURCES += $$PWD/*.cc
 HEADERS += $$PWD/*.h
diff --git a/3rdparty/double-conversion/fast-dtoa.cc b/src/3rdparty/double-conversion/fast-dtoa.cc
index 1a0f823509..1a0f823509 100644
--- a/3rdparty/double-conversion/fast-dtoa.cc
+++ b/src/3rdparty/double-conversion/fast-dtoa.cc
diff --git a/3rdparty/double-conversion/fast-dtoa.h b/src/3rdparty/double-conversion/fast-dtoa.h
index 5f1e8eee5e..5f1e8eee5e 100644
--- a/3rdparty/double-conversion/fast-dtoa.h
+++ b/src/3rdparty/double-conversion/fast-dtoa.h
diff --git a/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc
index d56b1449b2..d56b1449b2 100644
--- a/3rdparty/double-conversion/fixed-dtoa.cc
+++ b/src/3rdparty/double-conversion/fixed-dtoa.cc
diff --git a/3rdparty/double-conversion/fixed-dtoa.h b/src/3rdparty/double-conversion/fixed-dtoa.h
index 3bdd08e21f..3bdd08e21f 100644
--- a/3rdparty/double-conversion/fixed-dtoa.h
+++ b/src/3rdparty/double-conversion/fixed-dtoa.h
diff --git a/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h
index 839dc47d45..839dc47d45 100644
--- a/3rdparty/double-conversion/ieee.h
+++ b/src/3rdparty/double-conversion/ieee.h
diff --git a/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc
index 9758989f71..9758989f71 100644
--- a/3rdparty/double-conversion/strtod.cc
+++ b/src/3rdparty/double-conversion/strtod.cc
diff --git a/3rdparty/double-conversion/strtod.h b/src/3rdparty/double-conversion/strtod.h
index ed0293b8f5..ed0293b8f5 100644
--- a/3rdparty/double-conversion/strtod.h
+++ b/src/3rdparty/double-conversion/strtod.h
diff --git a/3rdparty/double-conversion/utils.h b/src/3rdparty/double-conversion/utils.h
index 767094b8b7..767094b8b7 100644
--- a/3rdparty/double-conversion/utils.h
+++ b/src/3rdparty/double-conversion/utils.h
diff --git a/3rdparty/masm/WeakRandom.h b/src/3rdparty/masm/WeakRandom.h
index 325d1f6ac6..325d1f6ac6 100644
--- a/3rdparty/masm/WeakRandom.h
+++ b/src/3rdparty/masm/WeakRandom.h
diff --git a/3rdparty/masm/assembler/ARMAssembler.cpp b/src/3rdparty/masm/assembler/ARMAssembler.cpp
index 9655557a5d..9655557a5d 100644
--- a/3rdparty/masm/assembler/ARMAssembler.cpp
+++ b/src/3rdparty/masm/assembler/ARMAssembler.cpp
diff --git a/3rdparty/masm/assembler/ARMAssembler.h b/src/3rdparty/masm/assembler/ARMAssembler.h
index ebab46d98a..ebab46d98a 100644
--- a/3rdparty/masm/assembler/ARMAssembler.h
+++ b/src/3rdparty/masm/assembler/ARMAssembler.h
diff --git a/3rdparty/masm/assembler/ARMv7Assembler.cpp b/src/3rdparty/masm/assembler/ARMv7Assembler.cpp
index faca66421b..faca66421b 100644
--- a/3rdparty/masm/assembler/ARMv7Assembler.cpp
+++ b/src/3rdparty/masm/assembler/ARMv7Assembler.cpp
diff --git a/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h
index b93ec6e63f..b93ec6e63f 100644
--- a/3rdparty/masm/assembler/ARMv7Assembler.h
+++ b/src/3rdparty/masm/assembler/ARMv7Assembler.h
diff --git a/3rdparty/masm/assembler/AbstractMacroAssembler.h b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
index ee78ef84eb..ee78ef84eb 100644
--- a/3rdparty/masm/assembler/AbstractMacroAssembler.h
+++ b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
diff --git a/3rdparty/masm/assembler/AssemblerBuffer.h b/src/3rdparty/masm/assembler/AssemblerBuffer.h
index bc52801ba7..bc52801ba7 100644
--- a/3rdparty/masm/assembler/AssemblerBuffer.h
+++ b/src/3rdparty/masm/assembler/AssemblerBuffer.h
diff --git a/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h b/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
index 5377ef0c7a..5377ef0c7a 100644
--- a/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
+++ b/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
diff --git a/3rdparty/masm/assembler/CodeLocation.h b/src/3rdparty/masm/assembler/CodeLocation.h
index 86d1f2b755..86d1f2b755 100644
--- a/3rdparty/masm/assembler/CodeLocation.h
+++ b/src/3rdparty/masm/assembler/CodeLocation.h
diff --git a/3rdparty/masm/assembler/LinkBuffer.cpp b/src/3rdparty/masm/assembler/LinkBuffer.cpp
index c269157ba5..c269157ba5 100644
--- a/3rdparty/masm/assembler/LinkBuffer.cpp
+++ b/src/3rdparty/masm/assembler/LinkBuffer.cpp
diff --git a/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h
index e1882433c1..e1882433c1 100644
--- a/3rdparty/masm/assembler/LinkBuffer.h
+++ b/src/3rdparty/masm/assembler/LinkBuffer.h
diff --git a/3rdparty/masm/assembler/MIPSAssembler.h b/src/3rdparty/masm/assembler/MIPSAssembler.h
index 026f87e52a..026f87e52a 100644
--- a/3rdparty/masm/assembler/MIPSAssembler.h
+++ b/src/3rdparty/masm/assembler/MIPSAssembler.h
diff --git a/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h
index 3d57340f93..3d57340f93 100644
--- a/3rdparty/masm/assembler/MacroAssembler.h
+++ b/src/3rdparty/masm/assembler/MacroAssembler.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerARM.cpp b/src/3rdparty/masm/assembler/MacroAssemblerARM.cpp
index 98dc3e9879..98dc3e9879 100644
--- a/3rdparty/masm/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARM.cpp
diff --git a/3rdparty/masm/assembler/MacroAssemblerARM.h b/src/3rdparty/masm/assembler/MacroAssemblerARM.h
index 527126b438..527126b438 100644
--- a/3rdparty/masm/assembler/MacroAssemblerARM.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARM.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h
index 8d7a3a69aa..8d7a3a69aa 100644
--- a/3rdparty/masm/assembler/MacroAssemblerARMv7.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
index c2af24060a..c2af24060a 100644
--- a/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
index 3ab2553001..3ab2553001 100644
--- a/3rdparty/masm/assembler/MacroAssemblerMIPS.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerSH4.cpp b/src/3rdparty/masm/assembler/MacroAssemblerSH4.cpp
index 59de3ff48c..59de3ff48c 100644
--- a/3rdparty/masm/assembler/MacroAssemblerSH4.cpp
+++ b/src/3rdparty/masm/assembler/MacroAssemblerSH4.cpp
diff --git a/3rdparty/masm/assembler/MacroAssemblerSH4.h b/src/3rdparty/masm/assembler/MacroAssemblerSH4.h
index ef210f80cb..ef210f80cb 100644
--- a/3rdparty/masm/assembler/MacroAssemblerSH4.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerSH4.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerX86.h b/src/3rdparty/masm/assembler/MacroAssemblerX86.h
index 27a030edfd..27a030edfd 100644
--- a/3rdparty/masm/assembler/MacroAssemblerX86.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerX86.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerX86Common.h b/src/3rdparty/masm/assembler/MacroAssemblerX86Common.h
index 53cb80c210..53cb80c210 100644
--- a/3rdparty/masm/assembler/MacroAssemblerX86Common.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerX86Common.h
diff --git a/3rdparty/masm/assembler/MacroAssemblerX86_64.h b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h
index c711e6f8da..c711e6f8da 100644
--- a/3rdparty/masm/assembler/MacroAssemblerX86_64.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h
diff --git a/3rdparty/masm/assembler/RepatchBuffer.h b/src/3rdparty/masm/assembler/RepatchBuffer.h
index dbb56f9ad5..dbb56f9ad5 100644
--- a/3rdparty/masm/assembler/RepatchBuffer.h
+++ b/src/3rdparty/masm/assembler/RepatchBuffer.h
diff --git a/3rdparty/masm/assembler/SH4Assembler.h b/src/3rdparty/masm/assembler/SH4Assembler.h
index 39f5585be1..39f5585be1 100644
--- a/3rdparty/masm/assembler/SH4Assembler.h
+++ b/src/3rdparty/masm/assembler/SH4Assembler.h
diff --git a/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h
index 25ff6f0a50..25ff6f0a50 100644
--- a/3rdparty/masm/assembler/X86Assembler.h
+++ b/src/3rdparty/masm/assembler/X86Assembler.h
diff --git a/3rdparty/masm/config.h b/src/3rdparty/masm/config.h
index 5f59f311e3..5f59f311e3 100644
--- a/3rdparty/masm/config.h
+++ b/src/3rdparty/masm/config.h
diff --git a/3rdparty/masm/create_regex_tables b/src/3rdparty/masm/create_regex_tables
index bd799ba044..bd799ba044 100644
--- a/3rdparty/masm/create_regex_tables
+++ b/src/3rdparty/masm/create_regex_tables
diff --git a/3rdparty/masm/disassembler/Disassembler.cpp b/src/3rdparty/masm/disassembler/Disassembler.cpp
index 3fed2cdab8..3fed2cdab8 100644
--- a/3rdparty/masm/disassembler/Disassembler.cpp
+++ b/src/3rdparty/masm/disassembler/Disassembler.cpp
diff --git a/3rdparty/masm/disassembler/Disassembler.h b/src/3rdparty/masm/disassembler/Disassembler.h
index a087a657b3..a087a657b3 100644
--- a/3rdparty/masm/disassembler/Disassembler.h
+++ b/src/3rdparty/masm/disassembler/Disassembler.h
diff --git a/3rdparty/masm/disassembler/UDis86Disassembler.cpp b/src/3rdparty/masm/disassembler/UDis86Disassembler.cpp
index 63c235b920..63c235b920 100644
--- a/3rdparty/masm/disassembler/UDis86Disassembler.cpp
+++ b/src/3rdparty/masm/disassembler/UDis86Disassembler.cpp
diff --git a/3rdparty/masm/disassembler/udis86/differences.txt b/src/3rdparty/masm/disassembler/udis86/differences.txt
index dc225b6ffe..dc225b6ffe 100644
--- a/3rdparty/masm/disassembler/udis86/differences.txt
+++ b/src/3rdparty/masm/disassembler/udis86/differences.txt
diff --git a/3rdparty/masm/disassembler/udis86/itab.py b/src/3rdparty/masm/disassembler/udis86/itab.py
index 07e20a6e10..07e20a6e10 100644
--- a/3rdparty/masm/disassembler/udis86/itab.py
+++ b/src/3rdparty/masm/disassembler/udis86/itab.py
diff --git a/3rdparty/masm/disassembler/udis86/optable.xml b/src/3rdparty/masm/disassembler/udis86/optable.xml
index 14b4ac5935..14b4ac5935 100644
--- a/3rdparty/masm/disassembler/udis86/optable.xml
+++ b/src/3rdparty/masm/disassembler/udis86/optable.xml
diff --git a/3rdparty/masm/disassembler/udis86/ud_opcode.py b/src/3rdparty/masm/disassembler/udis86/ud_opcode.py
index f301b52461..f301b52461 100644
--- a/3rdparty/masm/disassembler/udis86/ud_opcode.py
+++ b/src/3rdparty/masm/disassembler/udis86/ud_opcode.py
diff --git a/3rdparty/masm/disassembler/udis86/ud_optable.py b/src/3rdparty/masm/disassembler/udis86/ud_optable.py
index 5b5c55d3b8..5b5c55d3b8 100644
--- a/3rdparty/masm/disassembler/udis86/ud_optable.py
+++ b/src/3rdparty/masm/disassembler/udis86/ud_optable.py
diff --git a/3rdparty/masm/disassembler/udis86/udis86.c b/src/3rdparty/masm/disassembler/udis86/udis86.c
index fbf76707a0..fbf76707a0 100644
--- a/3rdparty/masm/disassembler/udis86/udis86.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86.h b/src/3rdparty/masm/disassembler/udis86/udis86.h
index baaf495e04..baaf495e04 100644
--- a/3rdparty/masm/disassembler/udis86/udis86.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86.h
diff --git a/3rdparty/masm/disassembler/udis86/udis86_decode.c b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c
index a3fd576655..a3fd576655 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_decode.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_decode.h b/src/3rdparty/masm/disassembler/udis86/udis86_decode.h
index 940ed5ad6f..940ed5ad6f 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_decode.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_decode.h
diff --git a/3rdparty/masm/disassembler/udis86/udis86_extern.h b/src/3rdparty/masm/disassembler/udis86/udis86_extern.h
index 8e87721e8c..8e87721e8c 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_extern.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_extern.h
diff --git a/3rdparty/masm/disassembler/udis86/udis86_input.c b/src/3rdparty/masm/disassembler/udis86/udis86_input.c
index 76c6cccf36..76c6cccf36 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_input.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_input.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_input.h b/src/3rdparty/masm/disassembler/udis86/udis86_input.h
index 96865a88b5..96865a88b5 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_input.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_input.h
diff --git a/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c b/src/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c
index d5d8726d6a..d5d8726d6a 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn-att.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn-att.c
index 155a34ca29..155a34ca29 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_syn-att.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_syn-att.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
index d250bd449c..d250bd449c 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn.c
index 80391b4a08..80391b4a08 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_syn.c
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_syn.c
diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn.h b/src/3rdparty/masm/disassembler/udis86/udis86_syn.h
index e8636163ef..e8636163ef 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_syn.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_syn.h
diff --git a/3rdparty/masm/disassembler/udis86/udis86_types.h b/src/3rdparty/masm/disassembler/udis86/udis86_types.h
index 320d1ca491..320d1ca491 100644
--- a/3rdparty/masm/disassembler/udis86/udis86_types.h
+++ b/src/3rdparty/masm/disassembler/udis86/udis86_types.h
diff --git a/3rdparty/masm/jit/JITCompilationEffort.h b/src/3rdparty/masm/jit/JITCompilationEffort.h
index 5eb6801789..5eb6801789 100644
--- a/3rdparty/masm/jit/JITCompilationEffort.h
+++ b/src/3rdparty/masm/jit/JITCompilationEffort.h
diff --git a/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index a6d11f633c..92ad32d4ea 100644
--- a/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -6,6 +6,7 @@ SOURCES += $$PWD/assembler/MacroAssemblerARM.cpp
 SOURCES += $$PWD/assembler/MacroAssemblerSH4.cpp
 SOURCES += $$PWD/assembler/LinkBuffer.cpp
 
+HEADERS += $$PWD/wtf/*.h
 SOURCES += $$PWD/wtf/PrintStream.cpp
 HEADERS += $$PWD/wtf/PrintStream.h
 
diff --git a/3rdparty/masm/runtime/MatchResult.h b/src/3rdparty/masm/runtime/MatchResult.h
index d87c8516b0..d87c8516b0 100644
--- a/3rdparty/masm/runtime/MatchResult.h
+++ b/src/3rdparty/masm/runtime/MatchResult.h
diff --git a/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index 7b3004aa90..7b3004aa90 100644
--- a/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
diff --git a/3rdparty/masm/stubs/JSGlobalData.h b/src/3rdparty/masm/stubs/JSGlobalData.h
index 112bedddd7..112bedddd7 100644
--- a/3rdparty/masm/stubs/JSGlobalData.h
+++ b/src/3rdparty/masm/stubs/JSGlobalData.h
diff --git a/3rdparty/masm/stubs/LLIntData.h b/src/3rdparty/masm/stubs/LLIntData.h
index e69de29bb2..e69de29bb2 100644
--- a/3rdparty/masm/stubs/LLIntData.h
+++ b/src/3rdparty/masm/stubs/LLIntData.h
diff --git a/3rdparty/masm/stubs/Options.h b/src/3rdparty/masm/stubs/Options.h
index b95e4354e2..b95e4354e2 100644
--- a/3rdparty/masm/stubs/Options.h
+++ b/src/3rdparty/masm/stubs/Options.h
diff --git a/3rdparty/masm/stubs/WTFStubs.cpp b/src/3rdparty/masm/stubs/WTFStubs.cpp
index 530804fe3e..530804fe3e 100644
--- a/3rdparty/masm/stubs/WTFStubs.cpp
+++ b/src/3rdparty/masm/stubs/WTFStubs.cpp
diff --git a/3rdparty/masm/stubs/WTFStubs.h b/src/3rdparty/masm/stubs/WTFStubs.h
index ec77d25da7..ec77d25da7 100644
--- a/3rdparty/masm/stubs/WTFStubs.h
+++ b/src/3rdparty/masm/stubs/WTFStubs.h
diff --git a/3rdparty/masm/stubs/wtf/FastAllocBase.h b/src/3rdparty/masm/stubs/wtf/FastAllocBase.h
index a062a885af..a062a885af 100644
--- a/3rdparty/masm/stubs/wtf/FastAllocBase.h
+++ b/src/3rdparty/masm/stubs/wtf/FastAllocBase.h
diff --git a/3rdparty/masm/stubs/wtf/FastMalloc.h b/src/3rdparty/masm/stubs/wtf/FastMalloc.h
index 1248c79dec..1248c79dec 100644
--- a/3rdparty/masm/stubs/wtf/FastMalloc.h
+++ b/src/3rdparty/masm/stubs/wtf/FastMalloc.h
diff --git a/3rdparty/masm/stubs/wtf/Noncopyable.h b/src/3rdparty/masm/stubs/wtf/Noncopyable.h
index d3d1eed6d1..d3d1eed6d1 100644
--- a/3rdparty/masm/stubs/wtf/Noncopyable.h
+++ b/src/3rdparty/masm/stubs/wtf/Noncopyable.h
diff --git a/3rdparty/masm/stubs/wtf/OwnPtr.h b/src/3rdparty/masm/stubs/wtf/OwnPtr.h
index 31d2f1efa3..31d2f1efa3 100644
--- a/3rdparty/masm/stubs/wtf/OwnPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/OwnPtr.h
diff --git a/3rdparty/masm/stubs/wtf/PassOwnPtr.h b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h
index f9b84e7b57..f9b84e7b57 100644
--- a/3rdparty/masm/stubs/wtf/PassOwnPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h
diff --git a/3rdparty/masm/stubs/wtf/PassRefPtr.h b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h
index d97be1c330..d97be1c330 100644
--- a/3rdparty/masm/stubs/wtf/PassRefPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h
diff --git a/3rdparty/masm/stubs/wtf/RefCounted.h b/src/3rdparty/masm/stubs/wtf/RefCounted.h
index 4fc9ad9074..4fc9ad9074 100644
--- a/3rdparty/masm/stubs/wtf/RefCounted.h
+++ b/src/3rdparty/masm/stubs/wtf/RefCounted.h
diff --git a/3rdparty/masm/stubs/wtf/RefPtr.h b/src/3rdparty/masm/stubs/wtf/RefPtr.h
index 929b493b4b..929b493b4b 100644
--- a/3rdparty/masm/stubs/wtf/RefPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/RefPtr.h
diff --git a/3rdparty/masm/stubs/wtf/TypeTraits.h b/src/3rdparty/masm/stubs/wtf/TypeTraits.h
index 9b626a7a53..9b626a7a53 100644
--- a/3rdparty/masm/stubs/wtf/TypeTraits.h
+++ b/src/3rdparty/masm/stubs/wtf/TypeTraits.h
diff --git a/3rdparty/masm/stubs/wtf/UnusedParam.h b/src/3rdparty/masm/stubs/wtf/UnusedParam.h
index a676bdf303..a676bdf303 100644
--- a/3rdparty/masm/stubs/wtf/UnusedParam.h
+++ b/src/3rdparty/masm/stubs/wtf/UnusedParam.h
diff --git a/3rdparty/masm/stubs/wtf/Vector.h b/src/3rdparty/masm/stubs/wtf/Vector.h
index 1feea851e1..1feea851e1 100644
--- a/3rdparty/masm/stubs/wtf/Vector.h
+++ b/src/3rdparty/masm/stubs/wtf/Vector.h
diff --git a/3rdparty/masm/stubs/wtf/text/CString.h b/src/3rdparty/masm/stubs/wtf/text/CString.h
index c9a65e5c0b..c9a65e5c0b 100644
--- a/3rdparty/masm/stubs/wtf/text/CString.h
+++ b/src/3rdparty/masm/stubs/wtf/text/CString.h
diff --git a/3rdparty/masm/stubs/wtf/text/WTFString.h b/src/3rdparty/masm/stubs/wtf/text/WTFString.h
index d157dc7adc..d157dc7adc 100644
--- a/3rdparty/masm/stubs/wtf/text/WTFString.h
+++ b/src/3rdparty/masm/stubs/wtf/text/WTFString.h
diff --git a/3rdparty/masm/stubs/wtf/unicode/Unicode.h b/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h
index d61bc64c5a..d61bc64c5a 100644
--- a/3rdparty/masm/stubs/wtf/unicode/Unicode.h
+++ b/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h
diff --git a/3rdparty/masm/wtf/ASCIICType.h b/src/3rdparty/masm/wtf/ASCIICType.h
index 18e108e1bf..18e108e1bf 100644
--- a/3rdparty/masm/wtf/ASCIICType.h
+++ b/src/3rdparty/masm/wtf/ASCIICType.h
diff --git a/3rdparty/masm/wtf/Assertions.h b/src/3rdparty/masm/wtf/Assertions.h
index 7e079ab187..7e079ab187 100644
--- a/3rdparty/masm/wtf/Assertions.h
+++ b/src/3rdparty/masm/wtf/Assertions.h
diff --git a/3rdparty/masm/wtf/Atomics.h b/src/3rdparty/masm/wtf/Atomics.h
index 750e1092ad..750e1092ad 100644
--- a/3rdparty/masm/wtf/Atomics.h
+++ b/src/3rdparty/masm/wtf/Atomics.h
diff --git a/3rdparty/masm/wtf/BumpPointerAllocator.h b/src/3rdparty/masm/wtf/BumpPointerAllocator.h
index 3b2cfd974a..3b2cfd974a 100644
--- a/3rdparty/masm/wtf/BumpPointerAllocator.h
+++ b/src/3rdparty/masm/wtf/BumpPointerAllocator.h
diff --git a/3rdparty/masm/wtf/CheckedArithmetic.h b/src/3rdparty/masm/wtf/CheckedArithmetic.h
index f5d3b75500..f5d3b75500 100644
--- a/3rdparty/masm/wtf/CheckedArithmetic.h
+++ b/src/3rdparty/masm/wtf/CheckedArithmetic.h
diff --git a/3rdparty/masm/wtf/Compiler.h b/src/3rdparty/masm/wtf/Compiler.h
index a9ef419c18..a9ef419c18 100644
--- a/3rdparty/masm/wtf/Compiler.h
+++ b/src/3rdparty/masm/wtf/Compiler.h
diff --git a/3rdparty/masm/wtf/CryptographicallyRandomNumber.h b/src/3rdparty/masm/wtf/CryptographicallyRandomNumber.h
index 2262b6c3b3..2262b6c3b3 100644
--- a/3rdparty/masm/wtf/CryptographicallyRandomNumber.h
+++ b/src/3rdparty/masm/wtf/CryptographicallyRandomNumber.h
diff --git a/3rdparty/masm/wtf/DataLog.h b/src/3rdparty/masm/wtf/DataLog.h
index 0bd8efe727..0bd8efe727 100644
--- a/3rdparty/masm/wtf/DataLog.h
+++ b/src/3rdparty/masm/wtf/DataLog.h
diff --git a/3rdparty/masm/wtf/DynamicAnnotations.h b/src/3rdparty/masm/wtf/DynamicAnnotations.h
index 38acce35e6..38acce35e6 100644
--- a/3rdparty/masm/wtf/DynamicAnnotations.h
+++ b/src/3rdparty/masm/wtf/DynamicAnnotations.h
diff --git a/3rdparty/masm/wtf/FilePrintStream.cpp b/src/3rdparty/masm/wtf/FilePrintStream.cpp
index b5ab25e0bf..b5ab25e0bf 100644
--- a/3rdparty/masm/wtf/FilePrintStream.cpp
+++ b/src/3rdparty/masm/wtf/FilePrintStream.cpp
diff --git a/3rdparty/masm/wtf/FilePrintStream.h b/src/3rdparty/masm/wtf/FilePrintStream.h
index bdeab4c479..bdeab4c479 100644
--- a/3rdparty/masm/wtf/FilePrintStream.h
+++ b/src/3rdparty/masm/wtf/FilePrintStream.h
diff --git a/3rdparty/masm/wtf/Locker.h b/src/3rdparty/masm/wtf/Locker.h
index c465b99ea4..c465b99ea4 100644
--- a/3rdparty/masm/wtf/Locker.h
+++ b/src/3rdparty/masm/wtf/Locker.h
diff --git a/3rdparty/masm/wtf/NotFound.h b/src/3rdparty/masm/wtf/NotFound.h
index 4263bcecab..4263bcecab 100644
--- a/3rdparty/masm/wtf/NotFound.h
+++ b/src/3rdparty/masm/wtf/NotFound.h
diff --git a/3rdparty/masm/wtf/NullPtr.h b/src/3rdparty/masm/wtf/NullPtr.h
index 98c05140d8..98c05140d8 100644
--- a/3rdparty/masm/wtf/NullPtr.h
+++ b/src/3rdparty/masm/wtf/NullPtr.h
diff --git a/3rdparty/masm/wtf/OSAllocator.h b/src/3rdparty/masm/wtf/OSAllocator.h
index a12a467497..a12a467497 100644
--- a/3rdparty/masm/wtf/OSAllocator.h
+++ b/src/3rdparty/masm/wtf/OSAllocator.h
diff --git a/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
index b5b903b8a3..b5b903b8a3 100644
--- a/3rdparty/masm/wtf/OSAllocatorPosix.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
diff --git a/3rdparty/masm/wtf/OSAllocatorWin.cpp b/src/3rdparty/masm/wtf/OSAllocatorWin.cpp
index 7f5d9b8904..7f5d9b8904 100644
--- a/3rdparty/masm/wtf/OSAllocatorWin.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorWin.cpp
diff --git a/3rdparty/masm/wtf/PageAllocation.h b/src/3rdparty/masm/wtf/PageAllocation.h
index 18d31880c0..18d31880c0 100644
--- a/3rdparty/masm/wtf/PageAllocation.h
+++ b/src/3rdparty/masm/wtf/PageAllocation.h
diff --git a/3rdparty/masm/wtf/PageAllocationAligned.cpp b/src/3rdparty/masm/wtf/PageAllocationAligned.cpp
index 6f54710d0b..6f54710d0b 100644
--- a/3rdparty/masm/wtf/PageAllocationAligned.cpp
+++ b/src/3rdparty/masm/wtf/PageAllocationAligned.cpp
diff --git a/3rdparty/masm/wtf/PageAllocationAligned.h b/src/3rdparty/masm/wtf/PageAllocationAligned.h
index c018dabd8e..c018dabd8e 100644
--- a/3rdparty/masm/wtf/PageAllocationAligned.h
+++ b/src/3rdparty/masm/wtf/PageAllocationAligned.h
diff --git a/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp
index 8bbd7eb600..8bbd7eb600 100644
--- a/3rdparty/masm/wtf/PageBlock.cpp
+++ b/src/3rdparty/masm/wtf/PageBlock.cpp
diff --git a/3rdparty/masm/wtf/PageBlock.h b/src/3rdparty/masm/wtf/PageBlock.h
index 56e5570178..56e5570178 100644
--- a/3rdparty/masm/wtf/PageBlock.h
+++ b/src/3rdparty/masm/wtf/PageBlock.h
diff --git a/3rdparty/masm/wtf/PageReservation.h b/src/3rdparty/masm/wtf/PageReservation.h
index 77783ebcc4..77783ebcc4 100644
--- a/3rdparty/masm/wtf/PageReservation.h
+++ b/src/3rdparty/masm/wtf/PageReservation.h
diff --git a/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h
index f2fd3b0ad5..f2fd3b0ad5 100644
--- a/3rdparty/masm/wtf/Platform.h
+++ b/src/3rdparty/masm/wtf/Platform.h
diff --git a/3rdparty/masm/wtf/PossiblyNull.h b/src/3rdparty/masm/wtf/PossiblyNull.h
index 46a7d713be..46a7d713be 100644
--- a/3rdparty/masm/wtf/PossiblyNull.h
+++ b/src/3rdparty/masm/wtf/PossiblyNull.h
diff --git a/3rdparty/masm/wtf/PrintStream.cpp b/src/3rdparty/masm/wtf/PrintStream.cpp
index 7dd4060971..7dd4060971 100644
--- a/3rdparty/masm/wtf/PrintStream.cpp
+++ b/src/3rdparty/masm/wtf/PrintStream.cpp
diff --git a/3rdparty/masm/wtf/PrintStream.h b/src/3rdparty/masm/wtf/PrintStream.h
index 4134dcf182..4134dcf182 100644
--- a/3rdparty/masm/wtf/PrintStream.h
+++ b/src/3rdparty/masm/wtf/PrintStream.h
diff --git a/3rdparty/masm/wtf/RawPointer.h b/src/3rdparty/masm/wtf/RawPointer.h
index 6dc7292fb4..6dc7292fb4 100644
--- a/3rdparty/masm/wtf/RawPointer.h
+++ b/src/3rdparty/masm/wtf/RawPointer.h
diff --git a/3rdparty/masm/wtf/StdLibExtras.h b/src/3rdparty/masm/wtf/StdLibExtras.h
index f5e9f78df1..f5e9f78df1 100644
--- a/3rdparty/masm/wtf/StdLibExtras.h
+++ b/src/3rdparty/masm/wtf/StdLibExtras.h
diff --git a/3rdparty/masm/wtf/VMTags.h b/src/3rdparty/masm/wtf/VMTags.h
index 117bc3721e..117bc3721e 100644
--- a/3rdparty/masm/wtf/VMTags.h
+++ b/src/3rdparty/masm/wtf/VMTags.h
diff --git a/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
index d393e9fa90..d393e9fa90 100644
--- a/3rdparty/masm/yarr/Yarr.h
+++ b/src/3rdparty/masm/yarr/Yarr.h
diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp
index 7bb3d08eb5..7bb3d08eb5 100644
--- a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp
+++ b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp
diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h
index be0ead43d2..be0ead43d2 100644
--- a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h
+++ b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h
diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js
index 00361dd46e..00361dd46e 100644
--- a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js
+++ b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js
diff --git a/3rdparty/masm/yarr/YarrInterpreter.cpp b/src/3rdparty/masm/yarr/YarrInterpreter.cpp
index 31603f6d34..31603f6d34 100644
--- a/3rdparty/masm/yarr/YarrInterpreter.cpp
+++ b/src/3rdparty/masm/yarr/YarrInterpreter.cpp
diff --git a/3rdparty/masm/yarr/YarrInterpreter.h b/src/3rdparty/masm/yarr/YarrInterpreter.h
index fb60bd979d..fb60bd979d 100644
--- a/3rdparty/masm/yarr/YarrInterpreter.h
+++ b/src/3rdparty/masm/yarr/YarrInterpreter.h
diff --git a/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp
index ce84e2c74f..ce84e2c74f 100644
--- a/3rdparty/masm/yarr/YarrJIT.cpp
+++ b/src/3rdparty/masm/yarr/YarrJIT.cpp
diff --git a/3rdparty/masm/yarr/YarrJIT.h b/src/3rdparty/masm/yarr/YarrJIT.h
index bb7033fdea..bb7033fdea 100644
--- a/3rdparty/masm/yarr/YarrJIT.h
+++ b/src/3rdparty/masm/yarr/YarrJIT.h
diff --git a/3rdparty/masm/yarr/YarrParser.h b/src/3rdparty/masm/yarr/YarrParser.h
index 4bab1a0903..4bab1a0903 100644
--- a/3rdparty/masm/yarr/YarrParser.h
+++ b/src/3rdparty/masm/yarr/YarrParser.h
diff --git a/3rdparty/masm/yarr/YarrPattern.cpp b/src/3rdparty/masm/yarr/YarrPattern.cpp
index c953a38d2f..c953a38d2f 100644
--- a/3rdparty/masm/yarr/YarrPattern.cpp
+++ b/src/3rdparty/masm/yarr/YarrPattern.cpp
diff --git a/3rdparty/masm/yarr/YarrPattern.h b/src/3rdparty/masm/yarr/YarrPattern.h
index 14e89b8e09..14e89b8e09 100644
--- a/3rdparty/masm/yarr/YarrPattern.h
+++ b/src/3rdparty/masm/yarr/YarrPattern.h
diff --git a/3rdparty/masm/yarr/YarrSyntaxChecker.cpp b/src/3rdparty/masm/yarr/YarrSyntaxChecker.cpp
index aa98c4a354..aa98c4a354 100644
--- a/3rdparty/masm/yarr/YarrSyntaxChecker.cpp
+++ b/src/3rdparty/masm/yarr/YarrSyntaxChecker.cpp
diff --git a/3rdparty/masm/yarr/YarrSyntaxChecker.h b/src/3rdparty/masm/yarr/YarrSyntaxChecker.h
index 104ced3ab4..104ced3ab4 100644
--- a/3rdparty/masm/yarr/YarrSyntaxChecker.h
+++ b/src/3rdparty/masm/yarr/YarrSyntaxChecker.h
diff --git a/3rdparty/masm/yarr/yarr.pri b/src/3rdparty/masm/yarr/yarr.pri
index 7e9b4d3f3b..7e9b4d3f3b 100644
--- a/3rdparty/masm/yarr/yarr.pri
+++ b/src/3rdparty/masm/yarr/yarr.pri
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000000..706285498d
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = v4 tools
+CONFIG += ordered
diff --git a/main.cpp b/src/tools/main.cpp
index 07e8b3cc24..1983191942 100644
--- a/main.cpp
+++ b/src/tools/main.cpp
@@ -40,24 +40,24 @@
 ****************************************************************************/
 
 #ifndef QMLJS_NO_LLVM
-#  include "qv4_llvm_p.h"
+#  include "private/qv4_llvm_p.h"
 #endif
 
-#include "debugging.h"
-#include "qv4object.h"
-#include "qmljs_runtime.h"
-#include "qv4functionobject.h"
-#include "qv4errorobject.h"
-#include "qv4globalobject.h"
-#include "qv4codegen_p.h"
-#include "qv4isel_masm_p.h"
-#include "qv4isel_moth_p.h"
-#include "qv4vme_moth_p.h"
-#include "qv4syntaxchecker_p.h"
-#include "qv4objectproto.h"
-#include "qv4isel_p.h"
-#include "qv4mm.h"
-#include "qmljs_environment.h"
+#include "private/debugging.h"
+#include "private/qv4object.h"
+#include "private/qmljs_runtime.h"
+#include "private/qv4functionobject.h"
+#include "private/qv4errorobject.h"
+#include "private/qv4globalobject.h"
+#include "private/qv4codegen_p.h"
+#include "private/qv4isel_masm_p.h"
+#include "private/qv4isel_moth_p.h"
+#include "private/qv4vme_moth_p.h"
+#include "private/qv4syntaxchecker_p.h"
+#include "private/qv4objectproto.h"
+#include "private/qv4isel_p.h"
+#include "private/qv4mm.h"
+#include "private/qmljs_environment.h"
 
 #include <QtCore>
 #include <private/qqmljsengine_p.h>
@@ -72,7 +72,7 @@ namespace builtins {
 
 using namespace QQmlJS::VM;
 
-struct Print: FunctionObject
+struct Q_V4_EXPORT Print: FunctionObject
 {
     Print(ExecutionContext *scope): FunctionObject(scope) {
         name = scope->engine->newString("print");
@@ -91,7 +91,7 @@ struct Print: FunctionObject
     }
 };
 
-struct TestHarnessError: FunctionObject
+struct Q_V4_EXPORT TestHarnessError: FunctionObject
 {
     TestHarnessError(ExecutionContext *scope, bool &errorInTestHarness): FunctionObject(scope), errorOccurred(errorInTestHarness) {
         name = scope->engine->newString("$ERROR");
@@ -114,7 +114,7 @@ struct TestHarnessError: FunctionObject
     bool &errorOccurred;
 };
 
-struct GC: public FunctionObject
+struct Q_V4_EXPORT GC: public FunctionObject
 {
     GC(ExecutionContext* scope)
         : FunctionObject(scope)
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
new file mode 100644
index 0000000000..820eb18769
--- /dev/null
+++ b/src/tools/tools.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+QT = core v4 v4-private core-private qmldevtools-private
+SOURCES = main.cpp
+
+TARGET = v4
+
+INCLUDEPATH += ../v4
+INCLUDEPATH += ../3rdparty/masm
+INCLUDEPATH += ../3rdparty/masm/wtf
+INCLUDEPATH += ../3rdparty/masm/stubs
+INCLUDEPATH += ../3rdparty/masm/stubs/wtf
+INCLUDEPATH += ../3rdparty/masm/jit
+INCLUDEPATH += ../3rdparty/masm/assembler
+INCLUDEPATH += ../3rdparty/masm/disassembler
+
+DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
+DEFINES += QMLJS_NO_LLVM
\ No newline at end of file
diff --git a/debugging.cpp b/src/v4/debugging.cpp
index 61ae0e62d0..61ae0e62d0 100644
--- a/debugging.cpp
+++ b/src/v4/debugging.cpp
diff --git a/debugging.h b/src/v4/debugging.h
index e6626c53ce..00c96717a5 100644
--- a/debugging.h
+++ b/src/v4/debugging.h
@@ -30,6 +30,7 @@
 #ifndef DEBUGGING_H
 #define DEBUGGING_H
 
+#include "qv4global.h"
 #include "qmljs_engine.h"
 #include "qmljs_environment.h"
 
@@ -94,7 +95,7 @@ struct CallInfo
     {}
 };
 
-class Debugger
+class Q_V4_EXPORT Debugger
 {
 public:
     Debugger(VM::ExecutionEngine *_engine);
diff --git a/llvm_runtime.cpp b/src/v4/llvm_runtime.cpp
index 212c8d17d5..212c8d17d5 100644
--- a/llvm_runtime.cpp
+++ b/src/v4/llvm_runtime.cpp
diff --git a/moth/moth.pri b/src/v4/moth/moth.pri
index 73bd893286..73bd893286 100644
--- a/moth/moth.pri
+++ b/src/v4/moth/moth.pri
diff --git a/moth/qv4instr_moth.cpp b/src/v4/moth/qv4instr_moth.cpp
index a2bad39e00..a2bad39e00 100644
--- a/moth/qv4instr_moth.cpp
+++ b/src/v4/moth/qv4instr_moth.cpp
diff --git a/moth/qv4instr_moth_p.h b/src/v4/moth/qv4instr_moth_p.h
index 741ddba79d..741ddba79d 100644
--- a/moth/qv4instr_moth_p.h
+++ b/src/v4/moth/qv4instr_moth_p.h
diff --git a/moth/qv4isel_moth.cpp b/src/v4/moth/qv4isel_moth.cpp
index 5522be4c32..5522be4c32 100644
--- a/moth/qv4isel_moth.cpp
+++ b/src/v4/moth/qv4isel_moth.cpp
diff --git a/moth/qv4isel_moth_p.h b/src/v4/moth/qv4isel_moth_p.h
index 90b191b627..0b93ea853f 100644
--- a/moth/qv4isel_moth_p.h
+++ b/src/v4/moth/qv4isel_moth_p.h
@@ -1,6 +1,7 @@
 #ifndef QV4ISEL_MOTH_P_H
 #define QV4ISEL_MOTH_P_H
 
+#include "qv4global.h"
 #include "qv4isel_p.h"
 #include "qv4ir_p.h"
 #include "qv4object.h"
@@ -9,7 +10,7 @@
 namespace QQmlJS {
 namespace Moth {
 
-class InstructionSelection:
+class Q_V4_EXPORT InstructionSelection:
         public IR::InstructionSelection,
         public EvalInstructionSelection
 {
@@ -145,7 +146,7 @@ private:
     uchar *_codeEnd;
 };
 
-class ISelFactory: public EvalISelFactory
+class Q_V4_EXPORT ISelFactory: public EvalISelFactory
 {
 public:
     virtual ~ISelFactory() {}
diff --git a/moth/qv4vme_moth.cpp b/src/v4/moth/qv4vme_moth.cpp
index a3ab1de46a..a3ab1de46a 100644
--- a/moth/qv4vme_moth.cpp
+++ b/src/v4/moth/qv4vme_moth.cpp
diff --git a/moth/qv4vme_moth_p.h b/src/v4/moth/qv4vme_moth_p.h
index 2fd877f7b9..2fd877f7b9 100644
--- a/moth/qv4vme_moth_p.h
+++ b/src/v4/moth/qv4vme_moth_p.h
diff --git a/qmljs_engine.cpp b/src/v4/qmljs_engine.cpp
index 0b1b14b13e..0b1b14b13e 100644
--- a/qmljs_engine.cpp
+++ b/src/v4/qmljs_engine.cpp
diff --git a/qmljs_engine.h b/src/v4/qmljs_engine.h
index 01b1c511f6..f7416880a2 100644
--- a/qmljs_engine.h
+++ b/src/v4/qmljs_engine.h
@@ -41,9 +41,10 @@
 #ifndef QMLJS_ENGINE_H
 #define QMLJS_ENGINE_H
 
-#include <qv4isel_p.h>
-#include <qv4object.h>
-#include <qmljs_environment.h>
+#include "qv4global.h"
+#include "qv4isel_p.h"
+#include "qv4object.h"
+#include "qmljs_environment.h"
 #include <setjmp.h>
 
 #include <wtf/PassRefPtr.h>
@@ -94,7 +95,7 @@ struct EvalFunction;
 
 class RegExp;
 
-struct ExecutionEngine
+struct Q_V4_EXPORT ExecutionEngine
 {
     MemoryManager *memoryManager;
     EvalISelFactory *iselFactory;
diff --git a/qmljs_environment.cpp b/src/v4/qmljs_environment.cpp
index 9042a435a0..9042a435a0 100644
--- a/qmljs_environment.cpp
+++ b/src/v4/qmljs_environment.cpp
diff --git a/qmljs_environment.h b/src/v4/qmljs_environment.h
index c21cab55ac..111c6ae239 100644
--- a/qmljs_environment.h
+++ b/src/v4/qmljs_environment.h
@@ -41,6 +41,7 @@
 #ifndef QMLJS_ENVIRONMENT_H
 #define QMLJS_ENVIRONMENT_H
 
+#include "qv4global.h"
 #include <qmljs_runtime.h>
 
 namespace QQmlJS {
@@ -52,7 +53,7 @@ struct ExecutionEngine;
 struct ExecutionContext;
 struct DeclarativeEnvironment;
 
-struct DiagnosticMessage
+struct Q_V4_EXPORT DiagnosticMessage
 {
     enum { Error, Warning };
 
diff --git a/qmljs_math.h b/src/v4/qmljs_math.h
index 4645c5a324..4645c5a324 100644
--- a/qmljs_math.h
+++ b/src/v4/qmljs_math.h
diff --git a/qmljs_runtime.cpp b/src/v4/qmljs_runtime.cpp
index 9e50217554..ce1d1abbaa 100644
--- a/qmljs_runtime.cpp
+++ b/src/v4/qmljs_runtime.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include "qv4global.h"
 #include "debugging.h"
 #include "qmljs_runtime.h"
 #include "qv4object.h"
@@ -56,7 +57,7 @@
 #include <typeinfo>
 #include <stdlib.h>
 
-#include "3rdparty/double-conversion/double-conversion.h"
+#include "../3rdparty/double-conversion/double-conversion.h"
 
 namespace QQmlJS {
 namespace VM {
@@ -845,7 +846,7 @@ void __qmljs_throw(Value value, ExecutionContext *context)
     longjmp(handler.stackFrame, 1);
 }
 
-void *__qmljs_create_exception_handler(ExecutionContext *context)
+Q_V4_EXPORT void * __qmljs_create_exception_handler(ExecutionContext *context)
 {
     context->engine->exception = Value::undefinedValue();
     context->engine->unwindStack.append(ExecutionEngine::ExceptionHandler());
diff --git a/qmljs_runtime.h b/src/v4/qmljs_runtime.h
index 830dc9a628..2ea612642c 100644
--- a/qmljs_runtime.h
+++ b/src/v4/qmljs_runtime.h
@@ -41,8 +41,9 @@
 #ifndef QMLJS_RUNTIME_H
 #define QMLJS_RUNTIME_H
 
-#include <qmljs_value.h>
-#include <qmljs_math.h>
+#include "qmljs_value.h"
+#include "qmljs_math.h"
+
 
 #include <QtCore/QString>
 #include <QtCore/qnumeric.h>
diff --git a/qmljs_value.cpp b/src/v4/qmljs_value.cpp
index 8dba13a9c9..8dba13a9c9 100644
--- a/qmljs_value.cpp
+++ b/src/v4/qmljs_value.cpp
diff --git a/qmljs_value.h b/src/v4/qmljs_value.h
index 401b61fc8f..e11b08f50c 100644
--- a/qmljs_value.h
+++ b/src/v4/qmljs_value.h
@@ -41,13 +41,12 @@
 #ifndef QMLJS_VALUE_H
 #define QMLJS_VALUE_H
 
-#include <wtf/Platform.h>
-
 #include <QtCore/QString>
 #include <QtCore/qnumeric.h>
-#include <qv4string.h>
+#include "qv4global.h"
+#include "qv4string.h"
 #include <QtCore/QDebug>
-#include <qv4managed.h>
+#include "qv4managed.h"
 
 namespace QQmlJS {
 namespace VM {
@@ -64,7 +63,7 @@ double __qmljs_to_number(Value value, ExecutionContext *ctx);
 typedef uint Bool;
 
 
-struct Value
+struct Q_V4_EXPORT Value
 {
     union {
         quint64 val;
diff --git a/qv4_llvm_p.h b/src/v4/qv4_llvm_p.h
index c0f18e555c..60625c8677 100644
--- a/qv4_llvm_p.h
+++ b/src/v4/qv4_llvm_p.h
@@ -30,6 +30,7 @@
 #ifndef QV4_LLVM_P_H
 #define QV4_LLVM_P_H
 
+#include "qv4global.h"
 #include "qv4ir_p.h"
 
 #include <QtCore/QString>
@@ -45,7 +46,7 @@ enum LLVMOutputType {
     LLVMOutputObject = 3 // .o
 };
 
-int compileWithLLVM(IR::Module *module, const QString &fileName,  LLVMOutputType outputType, int (*exec)(void *));
+Q_V4_EXPORT int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*)(void *));
 
 } // QQmlJS
 
diff --git a/qv4argumentsobject.cpp b/src/v4/qv4argumentsobject.cpp
index f7327506e9..f7327506e9 100644
--- a/qv4argumentsobject.cpp
+++ b/src/v4/qv4argumentsobject.cpp
diff --git a/qv4argumentsobject.h b/src/v4/qv4argumentsobject.h
index adbaf5db1a..adbaf5db1a 100644
--- a/qv4argumentsobject.h
+++ b/src/v4/qv4argumentsobject.h
diff --git a/qv4array.cpp b/src/v4/qv4array.cpp
index 9879b2f372..9879b2f372 100644
--- a/qv4array.cpp
+++ b/src/v4/qv4array.cpp
diff --git a/qv4array.h b/src/v4/qv4array.h
index 19aa99b4bb..86d438e4e1 100644
--- a/qv4array.h
+++ b/src/v4/qv4array.h
@@ -42,6 +42,7 @@
 #ifndef QV4ARRAY_H
 #define QV4ARRAY_H
 
+#include "qv4global.h"
 #include <QtCore/qmap.h>
 #include <qmljs_value.h>
 #include <qv4propertydescriptor.h>
@@ -147,7 +148,7 @@ inline SparseArrayNode *SparseArrayNode::upperBound(uint akey)
 
 
 
-struct Q_CORE_EXPORT SparseArray
+struct Q_V4_EXPORT SparseArray
 {
     SparseArray();
     ~SparseArray() {
diff --git a/qv4arrayobject.cpp b/src/v4/qv4arrayobject.cpp
index cbf34d3077..cbf34d3077 100644
--- a/qv4arrayobject.cpp
+++ b/src/v4/qv4arrayobject.cpp
diff --git a/qv4arrayobject.h b/src/v4/qv4arrayobject.h
index 8a15546c1c..8a15546c1c 100644
--- a/qv4arrayobject.h
+++ b/src/v4/qv4arrayobject.h
diff --git a/qv4booleanobject.cpp b/src/v4/qv4booleanobject.cpp
index 9df0f23a6a..9df0f23a6a 100644
--- a/qv4booleanobject.cpp
+++ b/src/v4/qv4booleanobject.cpp
diff --git a/qv4booleanobject.h b/src/v4/qv4booleanobject.h
index 44d87b1d50..44d87b1d50 100644
--- a/qv4booleanobject.h
+++ b/src/v4/qv4booleanobject.h
diff --git a/qv4codegen.cpp b/src/v4/qv4codegen.cpp
index 4c4f7dd1d6..4c4f7dd1d6 100644
--- a/qv4codegen.cpp
+++ b/src/v4/qv4codegen.cpp
diff --git a/qv4codegen_p.h b/src/v4/qv4codegen_p.h
index 89953c8ff9..d83e129782 100644
--- a/qv4codegen_p.h
+++ b/src/v4/qv4codegen_p.h
@@ -41,6 +41,7 @@
 #ifndef QV4CODEGEN_P_H
 #define QV4CODEGEN_P_H
 
+#include "qv4global.h"
 #include "qv4ir_p.h"
 #include <private/qqmljsastvisitor_p.h>
 #include <QtCore/QStringList>
@@ -67,7 +68,7 @@ public:
     virtual void syntaxError(VM::DiagnosticMessage *message) = 0;
 };
 
-class Codegen: protected AST::Visitor
+class Q_V4_EXPORT Codegen: protected AST::Visitor
 {
 public:
     Codegen(VM::ExecutionContext *ctx, bool strict);
diff --git a/qv4dateobject.cpp b/src/v4/qv4dateobject.cpp
index b9a4446087..b9a4446087 100644
--- a/qv4dateobject.cpp
+++ b/src/v4/qv4dateobject.cpp
diff --git a/qv4dateobject.h b/src/v4/qv4dateobject.h
index ede4473217..ede4473217 100644
--- a/qv4dateobject.h
+++ b/src/v4/qv4dateobject.h
diff --git a/qv4errorobject.cpp b/src/v4/qv4errorobject.cpp
index 9d4a067f35..9d4a067f35 100644
--- a/qv4errorobject.cpp
+++ b/src/v4/qv4errorobject.cpp
diff --git a/qv4errorobject.h b/src/v4/qv4errorobject.h
index d2d2340fae..d2d2340fae 100644
--- a/qv4errorobject.h
+++ b/src/v4/qv4errorobject.h
diff --git a/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp
index f5e37def0c..f5e37def0c 100644
--- a/qv4functionobject.cpp
+++ b/src/v4/qv4functionobject.cpp
diff --git a/qv4functionobject.h b/src/v4/qv4functionobject.h
index 822cee9491..b651eedcae 100644
--- a/qv4functionobject.h
+++ b/src/v4/qv4functionobject.h
@@ -41,6 +41,7 @@
 #ifndef QV4FUNCTIONOBJECT_H
 #define QV4FUNCTIONOBJECT_H
 
+#include "qv4global.h"
 #include "qmljs_runtime.h"
 #include "qmljs_engine.h"
 #include "qmljs_environment.h"
@@ -61,6 +62,9 @@
 #include <cstdio>
 #include <cassert>
 
+#include <config.h>
+#include <assembler/MacroAssemblerCodeRef.h>
+
 namespace QQmlJS {
 
 namespace VM {
@@ -131,7 +135,7 @@ struct Function {
     void mark();
 };
 
-struct FunctionObject: Object {
+struct Q_V4_EXPORT FunctionObject: Object {
     ExecutionContext *scope;
     String *name;
     String * const *formalParameterList;
diff --git a/src/v4/qv4global.h b/src/v4/qv4global.h
new file mode 100644
index 0000000000..6b1c9a21ec
--- /dev/null
+++ b/src/v4/qv4global.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QV4GLOBAL_H
+#define QV4GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_V4_LIB)
+#    define Q_V4_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_V4_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_V4_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QV4GLOBAL_H
diff --git a/qv4globalobject.cpp b/src/v4/qv4globalobject.cpp
index 74cd32d88a..74cd32d88a 100644
--- a/qv4globalobject.cpp
+++ b/src/v4/qv4globalobject.cpp
diff --git a/qv4globalobject.h b/src/v4/qv4globalobject.h
index fecad46daa..6a586c1802 100644
--- a/qv4globalobject.h
+++ b/src/v4/qv4globalobject.h
@@ -41,13 +41,14 @@
 #ifndef QV4GLOBALOBJECT_H
 #define QV4GLOBALOBJECT_H
 
+#include "qv4global.h"
 #include "qv4functionobject.h"
 
 namespace QQmlJS {
 
 namespace VM {
 
-struct EvalFunction : FunctionObject
+struct Q_V4_EXPORT EvalFunction : FunctionObject
 {
     EvalFunction(ExecutionContext *scope);
 
diff --git a/qv4ir.cpp b/src/v4/qv4ir.cpp
index 1c2a9d9e62..1c2a9d9e62 100644
--- a/qv4ir.cpp
+++ b/src/v4/qv4ir.cpp
diff --git a/qv4ir_p.h b/src/v4/qv4ir_p.h
index 64f59f41d4..4e60fa96dd 100644
--- a/qv4ir_p.h
+++ b/src/v4/qv4ir_p.h
@@ -52,15 +52,13 @@
 // We mean it.
 //
 
+#include "qv4global.h"
 #include <private/qqmljsmemorypool_p.h>
 
 #include <QtCore/QVector>
 #include <QtCore/QString>
 #include <QtCore/QBitArray>
 
-#include <config.h>
-#include <assembler/MacroAssemblerCodeRef.h>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -589,7 +587,7 @@ struct Ret: Stmt {
     virtual void dump(QTextStream &out, Mode);
 };
 
-struct Module {
+struct Q_V4_EXPORT Module {
     MemoryPool pool;
     QVector<Function *> functions;
     Function *rootFunction;
diff --git a/qv4isel_llvm.cpp b/src/v4/qv4isel_llvm.cpp
index e575fa0bd1..091936813d 100644
--- a/qv4isel_llvm.cpp
+++ b/src/v4/qv4isel_llvm.cpp
@@ -80,10 +80,11 @@
 #include "qv4_llvm_p.h"
 #include "qv4ir_p.h"
 #include "qv4string.h"
+#include "qv4global.h"
 
 namespace QQmlJS {
 
-int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*exec)(void *))
+Q_V4_EXPORT int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*exec)(void *))
 {
     Q_ASSERT(module);
     Q_ASSERT(exec || outputType != LLVMOutputJit);
diff --git a/qv4isel_llvm_p.h b/src/v4/qv4isel_llvm_p.h
index 46fd2fefa4..46fd2fefa4 100644
--- a/qv4isel_llvm_p.h
+++ b/src/v4/qv4isel_llvm_p.h
diff --git a/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp
index a4a136c656..a4a136c656 100644
--- a/qv4isel_masm.cpp
+++ b/src/v4/qv4isel_masm.cpp
diff --git a/qv4isel_masm_p.h b/src/v4/qv4isel_masm_p.h
index 5a4a29b154..de0971f0cb 100644
--- a/qv4isel_masm_p.h
+++ b/src/v4/qv4isel_masm_p.h
@@ -41,6 +41,7 @@
 #ifndef QV4ISEL_MASM_P_H
 #define QV4ISEL_MASM_P_H
 
+#include "qv4global.h"
 #include "qv4ir_p.h"
 #include "qv4isel_p.h"
 #include "qv4isel_util_p.h"
@@ -663,7 +664,7 @@ private:
     QList<CallToLink> _callsToLink;
 };
 
-class InstructionSelection:
+class Q_V4_EXPORT InstructionSelection:
         protected IR::InstructionSelection,
         public EvalInstructionSelection
 {
@@ -783,7 +784,7 @@ private:
     Assembler* _asm;
 };
 
-class ISelFactory: public EvalISelFactory
+class Q_V4_EXPORT ISelFactory: public EvalISelFactory
 {
 public:
     virtual ~ISelFactory() {}
diff --git a/qv4isel_p.cpp b/src/v4/qv4isel_p.cpp
index b408be3673..b408be3673 100644
--- a/qv4isel_p.cpp
+++ b/src/v4/qv4isel_p.cpp
diff --git a/qv4isel_p.h b/src/v4/qv4isel_p.h
index 0fb3e8de39..d4f7052373 100644
--- a/qv4isel_p.h
+++ b/src/v4/qv4isel_p.h
@@ -30,6 +30,7 @@
 #ifndef QV4ISEL_P_H
 #define QV4ISEL_P_H
 
+#include "qv4global.h"
 #include "qv4ir_p.h"
 
 #include <qglobal.h>
@@ -42,7 +43,7 @@ struct ExecutionEngine;
 struct Function;
 } // namespace VM
 
-class EvalInstructionSelection
+class Q_V4_EXPORT EvalInstructionSelection
 {
 public:
     EvalInstructionSelection(VM::ExecutionEngine *engine, IR::Module *module);
@@ -60,7 +61,7 @@ private:
     QHash<IR::Function *, VM::Function *> _irToVM;
 };
 
-class EvalISelFactory
+class Q_V4_EXPORT EvalISelFactory
 {
 public:
     virtual ~EvalISelFactory() = 0;
@@ -68,7 +69,7 @@ public:
 };
 
 namespace IR {
-class InstructionSelection: protected IR::StmtVisitor
+class Q_V4_EXPORT InstructionSelection: protected IR::StmtVisitor
 {
 public:
     virtual ~InstructionSelection() = 0;
diff --git a/qv4isel_util_p.h b/src/v4/qv4isel_util_p.h
index 693af03e88..693af03e88 100644
--- a/qv4isel_util_p.h
+++ b/src/v4/qv4isel_util_p.h
diff --git a/qv4jsonobject.cpp b/src/v4/qv4jsonobject.cpp
index fa39476f4e..fa39476f4e 100644
--- a/qv4jsonobject.cpp
+++ b/src/v4/qv4jsonobject.cpp
diff --git a/qv4jsonobject.h b/src/v4/qv4jsonobject.h
index 7c1df7c40b..7c1df7c40b 100644
--- a/qv4jsonobject.h
+++ b/src/v4/qv4jsonobject.h
diff --git a/qv4managed.cpp b/src/v4/qv4managed.cpp
index 8156878508..8156878508 100644
--- a/qv4managed.cpp
+++ b/src/v4/qv4managed.cpp
diff --git a/qv4managed.h b/src/v4/qv4managed.h
index 7b6768d166..dc4d1f2243 100644
--- a/qv4managed.h
+++ b/src/v4/qv4managed.h
@@ -45,6 +45,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QDebug>
 #include <wtf/Platform.h>
+#include "qv4global.h"
 
 namespace QQmlJS {
 
@@ -69,7 +70,7 @@ struct ArgumentsObject;
 struct JSONObject;
 struct ForeachIteratorObject;
 
-struct Managed
+struct Q_V4_EXPORT Managed
 {
 private:
     void *operator new(size_t);
diff --git a/qv4mathobject.cpp b/src/v4/qv4mathobject.cpp
index e40faba861..e40faba861 100644
--- a/qv4mathobject.cpp
+++ b/src/v4/qv4mathobject.cpp
diff --git a/qv4mathobject.h b/src/v4/qv4mathobject.h
index c8428d2942..c8428d2942 100644
--- a/qv4mathobject.h
+++ b/src/v4/qv4mathobject.h
diff --git a/qv4mm.cpp b/src/v4/qv4mm.cpp
index c77ec1eaba..c77ec1eaba 100644
--- a/qv4mm.cpp
+++ b/src/v4/qv4mm.cpp
diff --git a/qv4mm.h b/src/v4/qv4mm.h
index 48d0c3d12e..6f747f53d2 100644
--- a/qv4mm.h
+++ b/src/v4/qv4mm.h
@@ -30,6 +30,7 @@
 #ifndef QV4GC_H
 #define QV4GC_H
 
+#include "qv4global.h"
 #include "qv4object.h"
 
 #include <QScopedPointer>
@@ -41,7 +42,7 @@ namespace VM {
 
 struct Managed;
 
-class MemoryManager
+class Q_V4_EXPORT MemoryManager
 {
     MemoryManager(const MemoryManager &);
     MemoryManager &operator=(const MemoryManager&);
diff --git a/qv4numberobject.cpp b/src/v4/qv4numberobject.cpp
index 08711a8187..08711a8187 100644
--- a/qv4numberobject.cpp
+++ b/src/v4/qv4numberobject.cpp
diff --git a/qv4numberobject.h b/src/v4/qv4numberobject.h
index 85f9e1ff2b..85f9e1ff2b 100644
--- a/qv4numberobject.h
+++ b/src/v4/qv4numberobject.h
diff --git a/qv4object.cpp b/src/v4/qv4object.cpp
index dadf8479c2..dadf8479c2 100644
--- a/qv4object.cpp
+++ b/src/v4/qv4object.cpp
diff --git a/qv4object.h b/src/v4/qv4object.h
index c50ffe2755..73d62bf209 100644
--- a/qv4object.h
+++ b/src/v4/qv4object.h
@@ -41,6 +41,7 @@
 #ifndef QMLJS_OBJECTS_H
 #define QMLJS_OBJECTS_H
 
+#include "qv4global.h"
 #include "qmljs_runtime.h"
 #include "qmljs_engine.h"
 #include "qmljs_environment.h"
@@ -98,7 +99,7 @@ struct TypeErrorPrototype;
 struct URIErrorPrototype;
 
 
-struct Object: Managed {
+struct Q_V4_EXPORT Object: Managed {
     Object *prototype;
     QScopedPointer<PropertyTable> members;
     Array array;
diff --git a/qv4objectiterator.cpp b/src/v4/qv4objectiterator.cpp
index 8da2e7bdba..8da2e7bdba 100644
--- a/qv4objectiterator.cpp
+++ b/src/v4/qv4objectiterator.cpp
diff --git a/qv4objectiterator.h b/src/v4/qv4objectiterator.h
index baecc25424..baecc25424 100644
--- a/qv4objectiterator.h
+++ b/src/v4/qv4objectiterator.h
diff --git a/qv4objectproto.cpp b/src/v4/qv4objectproto.cpp
index 98f205d1d8..98f205d1d8 100644
--- a/qv4objectproto.cpp
+++ b/src/v4/qv4objectproto.cpp
diff --git a/qv4objectproto.h b/src/v4/qv4objectproto.h
index 93527a28ef..93527a28ef 100644
--- a/qv4objectproto.h
+++ b/src/v4/qv4objectproto.h
diff --git a/qv4propertydescriptor.h b/src/v4/qv4propertydescriptor.h
index dc9e1c556d..dc9e1c556d 100644
--- a/qv4propertydescriptor.h
+++ b/src/v4/qv4propertydescriptor.h
diff --git a/qv4propertytable.h b/src/v4/qv4propertytable.h
index 3bd47679b5..3bd47679b5 100644
--- a/qv4propertytable.h
+++ b/src/v4/qv4propertytable.h
diff --git a/qv4regexp.cpp b/src/v4/qv4regexp.cpp
index bcef815e25..bcef815e25 100644
--- a/qv4regexp.cpp
+++ b/src/v4/qv4regexp.cpp
diff --git a/qv4regexp.h b/src/v4/qv4regexp.h
index 7eae033bec..7eae033bec 100644
--- a/qv4regexp.h
+++ b/src/v4/qv4regexp.h
diff --git a/qv4regexpobject.cpp b/src/v4/qv4regexpobject.cpp
index 1f78c56782..1f78c56782 100644
--- a/qv4regexpobject.cpp
+++ b/src/v4/qv4regexpobject.cpp
diff --git a/qv4regexpobject.h b/src/v4/qv4regexpobject.h
index 50241f2daf..50241f2daf 100644
--- a/qv4regexpobject.h
+++ b/src/v4/qv4regexpobject.h
diff --git a/qv4string.cpp b/src/v4/qv4string.cpp
index 6e0c14d108..6e0c14d108 100644
--- a/qv4string.cpp
+++ b/src/v4/qv4string.cpp
diff --git a/qv4string.h b/src/v4/qv4string.h
index 34e241218c..34e241218c 100644
--- a/qv4string.h
+++ b/src/v4/qv4string.h
diff --git a/qv4stringobject.cpp b/src/v4/qv4stringobject.cpp
index 81968cc55a..81968cc55a 100644
--- a/qv4stringobject.cpp
+++ b/src/v4/qv4stringobject.cpp
diff --git a/qv4stringobject.h b/src/v4/qv4stringobject.h
index 1becd97a46..1becd97a46 100644
--- a/qv4stringobject.h
+++ b/src/v4/qv4stringobject.h
diff --git a/qv4syntaxchecker.cpp b/src/v4/qv4syntaxchecker.cpp
index fcda486af2..fcda486af2 100644
--- a/qv4syntaxchecker.cpp
+++ b/src/v4/qv4syntaxchecker.cpp
diff --git a/qv4syntaxchecker_p.h b/src/v4/qv4syntaxchecker_p.h
index 38e123762e..38e123762e 100644
--- a/qv4syntaxchecker_p.h
+++ b/src/v4/qv4syntaxchecker_p.h
diff --git a/v4.pro b/src/v4/v4.pro
index 12e9013c6c..6d990ed234 100644
--- a/v4.pro
+++ b/src/v4/v4.pro
@@ -1,18 +1,27 @@
-QT = core-private qmldevtools-private
-CONFIG -= app_bundle
-CONFIG += console
+TARGET = QtV4
+QT_PRIVATE = core-private qmldevtools-private
+
+CONFIG += internal_module
 
 LLVM_CONFIG=llvm-config
 
 OBJECTS_DIR=.obj
 
+load(qt_build_config)
+load(qt_module)
+
+CONFIG += warn_off
+
+#win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 #TODO ??!
+
+
 # Pick up the qmake variable or environment variable for LLVM_INSTALL_DIR. If either was set, change the LLVM_CONFIG to use that.
 isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
 !isEmpty(LLVM_INSTALL_DIR):LLVM_CONFIG=$$LLVM_INSTALL_DIR/bin/llvm-config
 
 !macx-clang*:LIBS += -rdynamic
 
-SOURCES += main.cpp \
+SOURCES += \
     qv4codegen.cpp \
     qv4ir.cpp \
     qmljs_engine.cpp \
@@ -46,6 +55,7 @@ SOURCES += main.cpp \
     qv4regexp.cpp
 
 HEADERS += \
+    qv4global.h \
     qv4codegen_p.h \
     qv4ir_p.h \
     qmljs_engine.h \
@@ -126,8 +136,8 @@ linux-g++*:isEqual(QT_ARCH,i386) {
     QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
 }
 
-TESTSCRIPT=$$PWD/tests/test262.py
-V4CMD = $$OUT_PWD/v4
+TESTSCRIPT=$$PWD/../../tests/test262.py
+V4CMD = $$OUT_PWD/../tools/v4
 
 checktarget.target = check
 checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
@@ -141,5 +151,5 @@ QMAKE_EXTRA_TARGETS += checkmothtarget
 
 
 include(moth/moth.pri)
-include(3rdparty/masm/masm.pri)
-include(3rdparty/double-conversion/double-conversion.pri)
+include(../3rdparty/masm/masm.pri)
+include(../3rdparty/double-conversion/double-conversion.pri)
diff --git a/sync.profile b/sync.profile
new file mode 100644
index 0000000000..4e6f5f7cff
--- /dev/null
+++ b/sync.profile
@@ -0,0 +1,20 @@
+%modules = ( # path to module name map
+    "QtV4" => "$basedir/src",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+    #"QtV4" => "3rdparty/masm;v4;",
+);
+@allmoduleheadersprivate = (
+    "QtV4"
+);
+
+# Module dependencies.
+# Every module that is required to build this module should have one entry.
+# Each of the module version specifiers can take one of the following values:
+#   - A specific Git revision.
+#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+#
+%dependencies = (
+        "qtbase" => "refs/heads/dev",
+        "qtdeclarative" => "refs/heads/dev",
+);
diff --git a/v4vm.pro b/v4vm.pro
new file mode 100644
index 0000000000..0c67e6684a
--- /dev/null
+++ b/v4vm.pro
@@ -0,0 +1,2 @@
+load(configure)
+load(qt_parts)