aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-08-08 09:20:52 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-08 12:22:30 +0200
commit3288b87e2f75278c7415fbc7c4574bcf7da71295 (patch)
tree95df1e3f0eb76419e780da08b24fae28dc68c580
parent2d9262a4c6680e3818bf7c07a4d1cfa32b4c9dfe (diff)
Restructure source code
Move the v4 engine classes from a subdir of qml/qml into two subdirs (compiler and jsruntime) of the qml module Remove an unsued qv4syntaxchecker class, and move the moth code directly into compiler. Change-Id: I6929bede1f25098e6cb2e68087e779fac16b0c68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/qml/compiler/compiler.pri27
-rw-r--r--src/qml/compiler/qv4codegen.cpp (renamed from src/qml/qml/v4/qv4codegen.cpp)0
-rw-r--r--src/qml/compiler/qv4codegen_p.h (renamed from src/qml/qml/v4/qv4codegen_p.h)2
-rw-r--r--src/qml/compiler/qv4instr_moth.cpp (renamed from src/qml/qml/v4/moth/qv4instr_moth.cpp)0
-rw-r--r--src/qml/compiler/qv4instr_moth_p.h (renamed from src/qml/qml/v4/moth/qv4instr_moth_p.h)0
-rw-r--r--src/qml/compiler/qv4isel_masm.cpp (renamed from src/qml/qml/v4/qv4isel_masm.cpp)0
-rw-r--r--src/qml/compiler/qv4isel_masm_p.h (renamed from src/qml/qml/v4/qv4isel_masm_p.h)8
-rw-r--r--src/qml/compiler/qv4isel_moth.cpp (renamed from src/qml/qml/v4/moth/qv4isel_moth.cpp)0
-rw-r--r--src/qml/compiler/qv4isel_moth_p.h (renamed from src/qml/qml/v4/moth/qv4isel_moth_p.h)0
-rw-r--r--src/qml/compiler/qv4isel_p.cpp (renamed from src/qml/qml/v4/qv4isel_p.cpp)0
-rw-r--r--src/qml/compiler/qv4isel_p.h (renamed from src/qml/qml/v4/qv4isel_p.h)2
-rw-r--r--src/qml/compiler/qv4isel_util_p.h (renamed from src/qml/qml/v4/qv4isel_util_p.h)2
-rw-r--r--src/qml/compiler/qv4jsir.cpp (renamed from src/qml/qml/v4/qv4jsir.cpp)0
-rw-r--r--src/qml/compiler/qv4jsir_p.h (renamed from src/qml/qml/v4/qv4jsir_p.h)2
-rw-r--r--src/qml/compiler/qv4ssa.cpp (renamed from src/qml/qml/v4/qv4ssa.cpp)0
-rw-r--r--src/qml/compiler/qv4ssa_p.h (renamed from src/qml/qml/v4/qv4ssa_p.h)0
-rw-r--r--src/qml/compiler/qv4vme_moth.cpp (renamed from src/qml/qml/v4/moth/qv4vme_moth.cpp)0
-rw-r--r--src/qml/compiler/qv4vme_moth_p.h (renamed from src/qml/qml/v4/moth/qv4vme_moth_p.h)0
-rw-r--r--src/qml/jsruntime/jsruntime.pri (renamed from src/qml/qml/v4/v4.pri)19
-rw-r--r--src/qml/jsruntime/qv4alloca_p.h (renamed from src/qml/qml/v4/qv4alloca_p.h)0
-rw-r--r--src/qml/jsruntime/qv4argumentsobject.cpp (renamed from src/qml/qml/v4/qv4argumentsobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4argumentsobject_p.h (renamed from src/qml/qml/v4/qv4argumentsobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4arrayobject.cpp (renamed from src/qml/qml/v4/qv4arrayobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4arrayobject_p.h (renamed from src/qml/qml/v4/qv4arrayobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4booleanobject.cpp (renamed from src/qml/qml/v4/qv4booleanobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4booleanobject_p.h (renamed from src/qml/qml/v4/qv4booleanobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4context.cpp (renamed from src/qml/qml/v4/qv4context.cpp)0
-rw-r--r--src/qml/jsruntime/qv4context_p.h (renamed from src/qml/qml/v4/qv4context_p.h)0
-rw-r--r--src/qml/jsruntime/qv4dateobject.cpp (renamed from src/qml/qml/v4/qv4dateobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4dateobject_p.h (renamed from src/qml/qml/v4/qv4dateobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4debugging.cpp (renamed from src/qml/qml/v4/qv4debugging.cpp)2
-rw-r--r--src/qml/jsruntime/qv4debugging_p.h (renamed from src/qml/qml/v4/qv4debugging_p.h)1
-rw-r--r--src/qml/jsruntime/qv4engine.cpp (renamed from src/qml/qml/v4/qv4engine.cpp)0
-rw-r--r--src/qml/jsruntime/qv4engine_p.h (renamed from src/qml/qml/v4/qv4engine_p.h)2
-rw-r--r--src/qml/jsruntime/qv4errorobject.cpp (renamed from src/qml/qml/v4/qv4errorobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4errorobject_p.h (renamed from src/qml/qml/v4/qv4errorobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4exception.cpp (renamed from src/qml/qml/v4/qv4exception.cpp)0
-rw-r--r--src/qml/jsruntime/qv4exception_gcc.cpp (renamed from src/qml/qml/v4/qv4exception_gcc.cpp)0
-rw-r--r--src/qml/jsruntime/qv4exception_p.h (renamed from src/qml/qml/v4/qv4exception_p.h)0
-rw-r--r--src/qml/jsruntime/qv4executableallocator.cpp (renamed from src/qml/qml/v4/qv4executableallocator.cpp)0
-rw-r--r--src/qml/jsruntime/qv4executableallocator_p.h (renamed from src/qml/qml/v4/qv4executableallocator_p.h)0
-rw-r--r--src/qml/jsruntime/qv4function.cpp (renamed from src/qml/qml/v4/qv4function.cpp)0
-rw-r--r--src/qml/jsruntime/qv4function_p.h (renamed from src/qml/qml/v4/qv4function_p.h)0
-rw-r--r--src/qml/jsruntime/qv4functionobject.cpp (renamed from src/qml/qml/v4/qv4functionobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4functionobject_p.h (renamed from src/qml/qml/v4/qv4functionobject_p.h)2
-rw-r--r--src/qml/jsruntime/qv4global_p.h (renamed from src/qml/qml/v4/qv4global_p.h)0
-rw-r--r--src/qml/jsruntime/qv4globalobject.cpp (renamed from src/qml/qml/v4/qv4globalobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4globalobject_p.h (renamed from src/qml/qml/v4/qv4globalobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4identifier.cpp (renamed from src/qml/qml/v4/qv4identifier.cpp)0
-rw-r--r--src/qml/jsruntime/qv4identifier_p.h (renamed from src/qml/qml/v4/qv4identifier_p.h)0
-rw-r--r--src/qml/jsruntime/qv4identifiertable.cpp (renamed from src/qml/qml/v4/qv4identifiertable.cpp)0
-rw-r--r--src/qml/jsruntime/qv4identifiertable_p.h (renamed from src/qml/qml/v4/qv4identifiertable_p.h)0
-rw-r--r--src/qml/jsruntime/qv4include.cpp (renamed from src/qml/qml/v4/qv4include.cpp)0
-rw-r--r--src/qml/jsruntime/qv4include_p.h (renamed from src/qml/qml/v4/qv4include_p.h)0
-rw-r--r--src/qml/jsruntime/qv4internalclass.cpp (renamed from src/qml/qml/v4/qv4internalclass.cpp)0
-rw-r--r--src/qml/jsruntime/qv4internalclass_p.h (renamed from src/qml/qml/v4/qv4internalclass_p.h)0
-rw-r--r--src/qml/jsruntime/qv4jsonobject.cpp (renamed from src/qml/qml/v4/qv4jsonobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4jsonobject_p.h (renamed from src/qml/qml/v4/qv4jsonobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4lookup.cpp (renamed from src/qml/qml/v4/qv4lookup.cpp)0
-rw-r--r--src/qml/jsruntime/qv4lookup_p.h (renamed from src/qml/qml/v4/qv4lookup_p.h)0
-rw-r--r--src/qml/jsruntime/qv4managed.cpp (renamed from src/qml/qml/v4/qv4managed.cpp)0
-rw-r--r--src/qml/jsruntime/qv4managed_p.h (renamed from src/qml/qml/v4/qv4managed_p.h)0
-rw-r--r--src/qml/jsruntime/qv4math_p.h (renamed from src/qml/qml/v4/qv4math_p.h)0
-rw-r--r--src/qml/jsruntime/qv4mathobject.cpp (renamed from src/qml/qml/v4/qv4mathobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4mathobject_p.h (renamed from src/qml/qml/v4/qv4mathobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4mm.cpp (renamed from src/qml/qml/v4/qv4mm.cpp)0
-rw-r--r--src/qml/jsruntime/qv4mm_p.h (renamed from src/qml/qml/v4/qv4mm_p.h)0
-rw-r--r--src/qml/jsruntime/qv4numberobject.cpp (renamed from src/qml/qml/v4/qv4numberobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4numberobject_p.h (renamed from src/qml/qml/v4/qv4numberobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4object.cpp (renamed from src/qml/qml/v4/qv4object.cpp)0
-rw-r--r--src/qml/jsruntime/qv4object_p.h (renamed from src/qml/qml/v4/qv4object_p.h)2
-rw-r--r--src/qml/jsruntime/qv4objectiterator.cpp (renamed from src/qml/qml/v4/qv4objectiterator.cpp)0
-rw-r--r--src/qml/jsruntime/qv4objectiterator_p.h (renamed from src/qml/qml/v4/qv4objectiterator_p.h)0
-rw-r--r--src/qml/jsruntime/qv4objectproto.cpp (renamed from src/qml/qml/v4/qv4objectproto.cpp)0
-rw-r--r--src/qml/jsruntime/qv4objectproto_p.h (renamed from src/qml/qml/v4/qv4objectproto_p.h)0
-rw-r--r--src/qml/jsruntime/qv4property_p.h (renamed from src/qml/qml/v4/qv4property_p.h)0
-rw-r--r--src/qml/jsruntime/qv4qmlextensions.cpp (renamed from src/qml/qml/v4/qv4qmlextensions.cpp)0
-rw-r--r--src/qml/jsruntime/qv4qmlextensions_p.h (renamed from src/qml/qml/v4/qv4qmlextensions_p.h)0
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp (renamed from src/qml/qml/v4/qv4qobjectwrapper.cpp)0
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper_p.h (renamed from src/qml/qml/v4/qv4qobjectwrapper_p.h)0
-rw-r--r--src/qml/jsruntime/qv4regexp.cpp (renamed from src/qml/qml/v4/qv4regexp.cpp)0
-rw-r--r--src/qml/jsruntime/qv4regexp_p.h (renamed from src/qml/qml/v4/qv4regexp_p.h)0
-rw-r--r--src/qml/jsruntime/qv4regexpobject.cpp (renamed from src/qml/qml/v4/qv4regexpobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4regexpobject_p.h (renamed from src/qml/qml/v4/qv4regexpobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4runtime.cpp (renamed from src/qml/qml/v4/qv4runtime.cpp)0
-rw-r--r--src/qml/jsruntime/qv4runtime_p.h (renamed from src/qml/qml/v4/qv4runtime_p.h)0
-rw-r--r--src/qml/jsruntime/qv4script.cpp (renamed from src/qml/qml/v4/qv4script.cpp)0
-rw-r--r--src/qml/jsruntime/qv4script_p.h (renamed from src/qml/qml/v4/qv4script_p.h)0
-rw-r--r--src/qml/jsruntime/qv4sequenceobject.cpp (renamed from src/qml/qml/v4/qv4sequenceobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4sequenceobject_p.h (renamed from src/qml/qml/v4/qv4sequenceobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4serialize.cpp (renamed from src/qml/qml/v4/qv4serialize.cpp)0
-rw-r--r--src/qml/jsruntime/qv4serialize_p.h (renamed from src/qml/qml/v4/qv4serialize_p.h)0
-rw-r--r--src/qml/jsruntime/qv4sparsearray.cpp (renamed from src/qml/qml/v4/qv4sparsearray.cpp)0
-rw-r--r--src/qml/jsruntime/qv4sparsearray_p.h (renamed from src/qml/qml/v4/qv4sparsearray_p.h)0
-rw-r--r--src/qml/jsruntime/qv4stacktrace.cpp (renamed from src/qml/qml/v4/qv4stacktrace.cpp)0
-rw-r--r--src/qml/jsruntime/qv4stacktrace_p.h (renamed from src/qml/qml/v4/qv4stacktrace_p.h)0
-rw-r--r--src/qml/jsruntime/qv4string.cpp (renamed from src/qml/qml/v4/qv4string.cpp)0
-rw-r--r--src/qml/jsruntime/qv4string_p.h (renamed from src/qml/qml/v4/qv4string_p.h)0
-rw-r--r--src/qml/jsruntime/qv4stringobject.cpp (renamed from src/qml/qml/v4/qv4stringobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4stringobject_p.h (renamed from src/qml/qml/v4/qv4stringobject_p.h)0
-rw-r--r--src/qml/jsruntime/qv4unwindhelper.cpp (renamed from src/qml/qml/v4/qv4unwindhelper.cpp)0
-rw-r--r--src/qml/jsruntime/qv4unwindhelper_p-arm.h (renamed from src/qml/qml/v4/qv4unwindhelper_p-arm.h)0
-rw-r--r--src/qml/jsruntime/qv4unwindhelper_p-dw2.h (renamed from src/qml/qml/v4/qv4unwindhelper_p-dw2.h)0
-rw-r--r--src/qml/jsruntime/qv4unwindhelper_p.h (renamed from src/qml/qml/v4/qv4unwindhelper_p.h)0
-rw-r--r--src/qml/jsruntime/qv4util_p.h (renamed from src/qml/qml/v4/qv4util_p.h)0
-rw-r--r--src/qml/jsruntime/qv4value.cpp (renamed from src/qml/qml/v4/qv4value.cpp)0
-rw-r--r--src/qml/jsruntime/qv4value_def_p.h (renamed from src/qml/qml/v4/qv4value_def_p.h)0
-rw-r--r--src/qml/jsruntime/qv4value_p.h (renamed from src/qml/qml/v4/qv4value_p.h)0
-rw-r--r--src/qml/jsruntime/qv4variantobject.cpp (renamed from src/qml/qml/v4/qv4variantobject.cpp)0
-rw-r--r--src/qml/jsruntime/qv4variantobject_p.h (renamed from src/qml/qml/v4/qv4variantobject_p.h)0
-rw-r--r--src/qml/qml.pro2
-rw-r--r--src/qml/qml/qml.pri1
-rw-r--r--src/qml/qml/v4/moth/moth.pri13
-rw-r--r--src/qml/qml/v4/qv4syntaxchecker.cpp123
-rw-r--r--src/qml/qml/v4/qv4syntaxchecker_p.h77
115 files changed, 40 insertions, 247 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
new file mode 100644
index 0000000000..61578fd011
--- /dev/null
+++ b/src/qml/compiler/compiler.pri
@@ -0,0 +1,27 @@
+include(../../3rdparty/masm/masm-defs.pri)
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += $$OUT_PWD
+
+HEADERS += \
+ $$PWD/qv4codegen_p.h \
+ $$PWD/qv4isel_masm_p.h \
+ $$PWD/qv4isel_p.h \
+ $$PWD/qv4jsir_p.h \
+ $$PWD/qv4vme_moth_p.h \
+ $$PWD/qv4instr_moth_p.h \
+ $$PWD/qv4isel_moth_p.h \
+ $$PWD/qv4isel_util_p.h \
+ $$PWD/qv4ssa_p.h
+
+SOURCES += \
+ $$PWD/qv4codegen.cpp \
+ $$PWD/qv4instr_moth.cpp \
+ $$PWD/qv4isel_masm.cpp \
+ $$PWD/qv4isel_moth.cpp \
+ $$PWD/qv4isel_p.cpp \
+ $$PWD/qv4jsir.cpp \
+ $$PWD/qv4ssa.cpp \
+ $$PWD/qv4vme_moth.cpp
+
+include(../../3rdparty/masm/masm.pri)
diff --git a/src/qml/qml/v4/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index d0c43c8f56..d0c43c8f56 100644
--- a/src/qml/qml/v4/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
diff --git a/src/qml/qml/v4/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index fe00d87852..75ca915a13 100644
--- a/src/qml/qml/v4/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -41,7 +41,7 @@
#ifndef QV4CODEGEN_P_H
#define QV4CODEGEN_P_H
-#include "qv4global_p.h"
+#include "private/qv4global_p.h"
#include "qv4jsir_p.h"
#include <private/qqmljsastvisitor_p.h>
#include <private/qqmljsast_p.h>
diff --git a/src/qml/qml/v4/moth/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp
index ec68ede72d..ec68ede72d 100644
--- a/src/qml/qml/v4/moth/qv4instr_moth.cpp
+++ b/src/qml/compiler/qv4instr_moth.cpp
diff --git a/src/qml/qml/v4/moth/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index ac7196e2d1..ac7196e2d1 100644
--- a/src/qml/qml/v4/moth/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
diff --git a/src/qml/qml/v4/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index 4317ba0d54..4317ba0d54 100644
--- a/src/qml/qml/v4/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
diff --git a/src/qml/qml/v4/qv4isel_masm_p.h b/src/qml/compiler/qv4isel_masm_p.h
index fa14ffac62..29fc8a5d67 100644
--- a/src/qml/qml/v4/qv4isel_masm_p.h
+++ b/src/qml/compiler/qv4isel_masm_p.h
@@ -41,13 +41,13 @@
#ifndef QV4ISEL_MASM_P_H
#define QV4ISEL_MASM_P_H
-#include "qv4global_p.h"
+#include "private/qv4global_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
#include "qv4isel_util_p.h"
-#include "qv4object_p.h"
-#include "qv4runtime_p.h"
-#include "qv4lookup_p.h"
+#include "private/qv4object_p.h"
+#include "private/qv4runtime_p.h"
+#include "private/qv4lookup_p.h"
#include <QtCore/QHash>
#include <config.h>
diff --git a/src/qml/qml/v4/moth/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp
index 610f429f5d..610f429f5d 100644
--- a/src/qml/qml/v4/moth/qv4isel_moth.cpp
+++ b/src/qml/compiler/qv4isel_moth.cpp
diff --git a/src/qml/qml/v4/moth/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h
index 9c17245f67..9c17245f67 100644
--- a/src/qml/qml/v4/moth/qv4isel_moth_p.h
+++ b/src/qml/compiler/qv4isel_moth_p.h
diff --git a/src/qml/qml/v4/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index ca8d249f9f..ca8d249f9f 100644
--- a/src/qml/qml/v4/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
diff --git a/src/qml/qml/v4/qv4isel_p.h b/src/qml/compiler/qv4isel_p.h
index ca49b4c8b1..965caf2cba 100644
--- a/src/qml/qml/v4/qv4isel_p.h
+++ b/src/qml/compiler/qv4isel_p.h
@@ -42,7 +42,7 @@
#ifndef QV4ISEL_P_H
#define QV4ISEL_P_H
-#include "qv4global_p.h"
+#include "private/qv4global_p.h"
#include "qv4jsir_p.h"
#include <qglobal.h>
diff --git a/src/qml/qml/v4/qv4isel_util_p.h b/src/qml/compiler/qv4isel_util_p.h
index 5aedaaff1b..a422150dd0 100644
--- a/src/qml/qml/v4/qv4isel_util_p.h
+++ b/src/qml/compiler/qv4isel_util_p.h
@@ -42,7 +42,7 @@
#ifndef QV4ISEL_UTIL_P_H
#define QV4ISEL_UTIL_P_H
-#include "qv4runtime_p.h"
+#include "private/qv4runtime_p.h"
#include "qv4jsir_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp
index 7f8d257429..7f8d257429 100644
--- a/src/qml/qml/v4/qv4jsir.cpp
+++ b/src/qml/compiler/qv4jsir.cpp
diff --git a/src/qml/qml/v4/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h
index 659d9870b1..364ff532c4 100644
--- a/src/qml/qml/v4/qv4jsir_p.h
+++ b/src/qml/compiler/qv4jsir_p.h
@@ -52,7 +52,7 @@
// We mean it.
//
-#include "qv4global_p.h"
+#include "private/qv4global_p.h"
#include <private/qqmljsmemorypool_p.h>
#include <private/qqmljsastfwd_p.h>
diff --git a/src/qml/qml/v4/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index a139ed9fff..a139ed9fff 100644
--- a/src/qml/qml/v4/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
diff --git a/src/qml/qml/v4/qv4ssa_p.h b/src/qml/compiler/qv4ssa_p.h
index 097a40eff1..097a40eff1 100644
--- a/src/qml/qml/v4/qv4ssa_p.h
+++ b/src/qml/compiler/qv4ssa_p.h
diff --git a/src/qml/qml/v4/moth/qv4vme_moth.cpp b/src/qml/compiler/qv4vme_moth.cpp
index a06ce4139a..a06ce4139a 100644
--- a/src/qml/qml/v4/moth/qv4vme_moth.cpp
+++ b/src/qml/compiler/qv4vme_moth.cpp
diff --git a/src/qml/qml/v4/moth/qv4vme_moth_p.h b/src/qml/compiler/qv4vme_moth_p.h
index 59692500ba..59692500ba 100644
--- a/src/qml/qml/v4/moth/qv4vme_moth_p.h
+++ b/src/qml/compiler/qv4vme_moth_p.h
diff --git a/src/qml/qml/v4/v4.pri b/src/qml/jsruntime/jsruntime.pri
index 4e230f42e0..a8f5f11a50 100644
--- a/src/qml/qml/v4/v4.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -1,5 +1,3 @@
-include(../../../3rdparty/masm/masm-defs.pri)
-
CONFIG += exceptions
CONFIG += warn_off
@@ -8,16 +6,10 @@ INCLUDEPATH += $$PWD
INCLUDEPATH += $$OUT_PWD
SOURCES += \
- $$PWD/qv4codegen.cpp \
- $$PWD/qv4ssa.cpp \
- $$PWD/qv4jsir.cpp \
$$PWD/qv4engine.cpp \
$$PWD/qv4context.cpp \
$$PWD/qv4runtime.cpp \
$$PWD/qv4value.cpp \
- $$PWD/qv4syntaxchecker.cpp \
- $$PWD/qv4isel_masm.cpp \
- $$PWD/qv4isel_p.cpp \
$$PWD/qv4debugging.cpp \
$$PWD/qv4lookup.cpp \
$$PWD/qv4identifier.cpp \
@@ -58,19 +50,12 @@ SOURCES += \
HEADERS += \
$$PWD/qv4global_p.h \
- $$PWD/qv4codegen_p.h \
- $$PWD/qv4ssa_p.h \
- $$PWD/qv4jsir_p.h \
$$PWD/qv4engine_p.h \
$$PWD/qv4context_p.h \
$$PWD/qv4runtime_p.h \
$$PWD/qv4math_p.h \
$$PWD/qv4value_p.h \
$$PWD/qv4value_def_p.h \
- $$PWD/qv4syntaxchecker_p.h \
- $$PWD/qv4isel_masm_p.h \
- $$PWD/qv4isel_p.h \
- $$PWD/qv4isel_util_p.h \
$$PWD/qv4debugging_p.h \
$$PWD/qv4lookup_p.h \
$$PWD/qv4identifier_p.h \
@@ -156,6 +141,4 @@ win32 {
LIBS_PRIVATE += -lDbgHelp
}
-include(moth/moth.pri)
-include(../../../3rdparty/masm/masm.pri)
-include(../../../3rdparty/double-conversion/double-conversion.pri)
+include(../../3rdparty/double-conversion/double-conversion.pri)
diff --git a/src/qml/qml/v4/qv4alloca_p.h b/src/qml/jsruntime/qv4alloca_p.h
index e4580da3d8..e4580da3d8 100644
--- a/src/qml/qml/v4/qv4alloca_p.h
+++ b/src/qml/jsruntime/qv4alloca_p.h
diff --git a/src/qml/qml/v4/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp
index 6247ef1504..6247ef1504 100644
--- a/src/qml/qml/v4/qv4argumentsobject.cpp
+++ b/src/qml/jsruntime/qv4argumentsobject.cpp
diff --git a/src/qml/qml/v4/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h
index 3d760b8937..3d760b8937 100644
--- a/src/qml/qml/v4/qv4argumentsobject_p.h
+++ b/src/qml/jsruntime/qv4argumentsobject_p.h
diff --git a/src/qml/qml/v4/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index b1f25177dd..b1f25177dd 100644
--- a/src/qml/qml/v4/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
diff --git a/src/qml/qml/v4/qv4arrayobject_p.h b/src/qml/jsruntime/qv4arrayobject_p.h
index 13c3882f4f..13c3882f4f 100644
--- a/src/qml/qml/v4/qv4arrayobject_p.h
+++ b/src/qml/jsruntime/qv4arrayobject_p.h
diff --git a/src/qml/qml/v4/qv4booleanobject.cpp b/src/qml/jsruntime/qv4booleanobject.cpp
index 24678d23dc..24678d23dc 100644
--- a/src/qml/qml/v4/qv4booleanobject.cpp
+++ b/src/qml/jsruntime/qv4booleanobject.cpp
diff --git a/src/qml/qml/v4/qv4booleanobject_p.h b/src/qml/jsruntime/qv4booleanobject_p.h
index 3e5e7663f2..3e5e7663f2 100644
--- a/src/qml/qml/v4/qv4booleanobject_p.h
+++ b/src/qml/jsruntime/qv4booleanobject_p.h
diff --git a/src/qml/qml/v4/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index ce947e51e8..ce947e51e8 100644
--- a/src/qml/qml/v4/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
diff --git a/src/qml/qml/v4/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index dfe02bdcc8..dfe02bdcc8 100644
--- a/src/qml/qml/v4/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
diff --git a/src/qml/qml/v4/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 3cf6cb1aeb..3cf6cb1aeb 100644
--- a/src/qml/qml/v4/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
diff --git a/src/qml/qml/v4/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h
index 4e833e143f..4e833e143f 100644
--- a/src/qml/qml/v4/qv4dateobject_p.h
+++ b/src/qml/jsruntime/qv4dateobject_p.h
diff --git a/src/qml/qml/v4/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp
index 624390d8f2..1b182eac89 100644
--- a/src/qml/qml/v4/qv4debugging.cpp
+++ b/src/qml/jsruntime/qv4debugging.cpp
@@ -43,7 +43,7 @@
#include "qv4object_p.h"
#include "qv4functionobject_p.h"
#include "qv4function_p.h"
-#include "moth/qv4instr_moth_p.h"
+#include "qv4instr_moth_p.h"
#include <iostream>
using namespace QV4;
diff --git a/src/qml/qml/v4/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h
index 4a273be732..d71b25f378 100644
--- a/src/qml/qml/v4/qv4debugging_p.h
+++ b/src/qml/jsruntime/qv4debugging_p.h
@@ -45,7 +45,6 @@
#include "qv4global_p.h"
#include "qv4engine_p.h"
#include "qv4context_p.h"
-#include "qv4jsir_p.h"
#include <QHash>
#include <QThread>
diff --git a/src/qml/qml/v4/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 0b7c850aa6..0b7c850aa6 100644
--- a/src/qml/qml/v4/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
diff --git a/src/qml/qml/v4/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 20fbf03ae2..a6bf2ef38e 100644
--- a/src/qml/qml/v4/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -42,7 +42,7 @@
#define QV4ENGINE_H
#include "qv4global_p.h"
-#include "qv4isel_p.h"
+#include "private/qv4isel_p.h"
#include "qv4util_p.h"
#include "qv4context_p.h"
#include "qv4property_p.h"
diff --git a/src/qml/qml/v4/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index 516a4d37f8..516a4d37f8 100644
--- a/src/qml/qml/v4/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
diff --git a/src/qml/qml/v4/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h
index d3e0f107bc..d3e0f107bc 100644
--- a/src/qml/qml/v4/qv4errorobject_p.h
+++ b/src/qml/jsruntime/qv4errorobject_p.h
diff --git a/src/qml/qml/v4/qv4exception.cpp b/src/qml/jsruntime/qv4exception.cpp
index 9f15c27ffc..9f15c27ffc 100644
--- a/src/qml/qml/v4/qv4exception.cpp
+++ b/src/qml/jsruntime/qv4exception.cpp
diff --git a/src/qml/qml/v4/qv4exception_gcc.cpp b/src/qml/jsruntime/qv4exception_gcc.cpp
index 0324a06e0b..0324a06e0b 100644
--- a/src/qml/qml/v4/qv4exception_gcc.cpp
+++ b/src/qml/jsruntime/qv4exception_gcc.cpp
diff --git a/src/qml/qml/v4/qv4exception_p.h b/src/qml/jsruntime/qv4exception_p.h
index 8ba06f57f4..8ba06f57f4 100644
--- a/src/qml/qml/v4/qv4exception_p.h
+++ b/src/qml/jsruntime/qv4exception_p.h
diff --git a/src/qml/qml/v4/qv4executableallocator.cpp b/src/qml/jsruntime/qv4executableallocator.cpp
index a754663556..a754663556 100644
--- a/src/qml/qml/v4/qv4executableallocator.cpp
+++ b/src/qml/jsruntime/qv4executableallocator.cpp
diff --git a/src/qml/qml/v4/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h
index 2a304baf9c..2a304baf9c 100644
--- a/src/qml/qml/v4/qv4executableallocator_p.h
+++ b/src/qml/jsruntime/qv4executableallocator_p.h
diff --git a/src/qml/qml/v4/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index bf633a9b41..bf633a9b41 100644
--- a/src/qml/qml/v4/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
diff --git a/src/qml/qml/v4/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 4dd0533d51..4dd0533d51 100644
--- a/src/qml/qml/v4/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
diff --git a/src/qml/qml/v4/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index ffdd08ed0a..ffdd08ed0a 100644
--- a/src/qml/qml/v4/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
diff --git a/src/qml/qml/v4/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 39e07a2b8d..8465142616 100644
--- a/src/qml/qml/v4/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -47,8 +47,6 @@
#include "qv4context_p.h"
#include "qv4object_p.h"
#include "qv4string_p.h"
-#include "qv4codegen_p.h"
-#include "qv4isel_p.h"
#include "qv4managed_p.h"
#include "qv4property_p.h"
#include "qv4objectiterator_p.h"
diff --git a/src/qml/qml/v4/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 8e47f3c88a..8e47f3c88a 100644
--- a/src/qml/qml/v4/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
diff --git a/src/qml/qml/v4/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 6b279416a3..6b279416a3 100644
--- a/src/qml/qml/v4/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
diff --git a/src/qml/qml/v4/qv4globalobject_p.h b/src/qml/jsruntime/qv4globalobject_p.h
index 11d034b5b4..11d034b5b4 100644
--- a/src/qml/qml/v4/qv4globalobject_p.h
+++ b/src/qml/jsruntime/qv4globalobject_p.h
diff --git a/src/qml/qml/v4/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp
index 5d8077bfdc..5d8077bfdc 100644
--- a/src/qml/qml/v4/qv4identifier.cpp
+++ b/src/qml/jsruntime/qv4identifier.cpp
diff --git a/src/qml/qml/v4/qv4identifier_p.h b/src/qml/jsruntime/qv4identifier_p.h
index 7c69e1d8c4..7c69e1d8c4 100644
--- a/src/qml/qml/v4/qv4identifier_p.h
+++ b/src/qml/jsruntime/qv4identifier_p.h
diff --git a/src/qml/qml/v4/qv4identifiertable.cpp b/src/qml/jsruntime/qv4identifiertable.cpp
index 5de2f893ef..5de2f893ef 100644
--- a/src/qml/qml/v4/qv4identifiertable.cpp
+++ b/src/qml/jsruntime/qv4identifiertable.cpp
diff --git a/src/qml/qml/v4/qv4identifiertable_p.h b/src/qml/jsruntime/qv4identifiertable_p.h
index 0f9a5921f9..0f9a5921f9 100644
--- a/src/qml/qml/v4/qv4identifiertable_p.h
+++ b/src/qml/jsruntime/qv4identifiertable_p.h
diff --git a/src/qml/qml/v4/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 4fd7bb14c7..4fd7bb14c7 100644
--- a/src/qml/qml/v4/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
diff --git a/src/qml/qml/v4/qv4include_p.h b/src/qml/jsruntime/qv4include_p.h
index d6bbcd1a60..d6bbcd1a60 100644
--- a/src/qml/qml/v4/qv4include_p.h
+++ b/src/qml/jsruntime/qv4include_p.h
diff --git a/src/qml/qml/v4/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp
index f4edc99545..f4edc99545 100644
--- a/src/qml/qml/v4/qv4internalclass.cpp
+++ b/src/qml/jsruntime/qv4internalclass.cpp
diff --git a/src/qml/qml/v4/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h
index fc6c5352b1..fc6c5352b1 100644
--- a/src/qml/qml/v4/qv4internalclass_p.h
+++ b/src/qml/jsruntime/qv4internalclass_p.h
diff --git a/src/qml/qml/v4/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index 782c388e5a..782c388e5a 100644
--- a/src/qml/qml/v4/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
diff --git a/src/qml/qml/v4/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h
index ccd99d5488..ccd99d5488 100644
--- a/src/qml/qml/v4/qv4jsonobject_p.h
+++ b/src/qml/jsruntime/qv4jsonobject_p.h
diff --git a/src/qml/qml/v4/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index b5ea877bd4..b5ea877bd4 100644
--- a/src/qml/qml/v4/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
diff --git a/src/qml/qml/v4/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h
index e77552826a..e77552826a 100644
--- a/src/qml/qml/v4/qv4lookup_p.h
+++ b/src/qml/jsruntime/qv4lookup_p.h
diff --git a/src/qml/qml/v4/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp
index 19adb354e3..19adb354e3 100644
--- a/src/qml/qml/v4/qv4managed.cpp
+++ b/src/qml/jsruntime/qv4managed.cpp
diff --git a/src/qml/qml/v4/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 5e3c142bb8..5e3c142bb8 100644
--- a/src/qml/qml/v4/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
diff --git a/src/qml/qml/v4/qv4math_p.h b/src/qml/jsruntime/qv4math_p.h
index a3a3715545..a3a3715545 100644
--- a/src/qml/qml/v4/qv4math_p.h
+++ b/src/qml/jsruntime/qv4math_p.h
diff --git a/src/qml/qml/v4/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp
index 7aa56f51bd..7aa56f51bd 100644
--- a/src/qml/qml/v4/qv4mathobject.cpp
+++ b/src/qml/jsruntime/qv4mathobject.cpp
diff --git a/src/qml/qml/v4/qv4mathobject_p.h b/src/qml/jsruntime/qv4mathobject_p.h
index 03c36bcc68..03c36bcc68 100644
--- a/src/qml/qml/v4/qv4mathobject_p.h
+++ b/src/qml/jsruntime/qv4mathobject_p.h
diff --git a/src/qml/qml/v4/qv4mm.cpp b/src/qml/jsruntime/qv4mm.cpp
index 0e53a2088f..0e53a2088f 100644
--- a/src/qml/qml/v4/qv4mm.cpp
+++ b/src/qml/jsruntime/qv4mm.cpp
diff --git a/src/qml/qml/v4/qv4mm_p.h b/src/qml/jsruntime/qv4mm_p.h
index f72d23dc9a..f72d23dc9a 100644
--- a/src/qml/qml/v4/qv4mm_p.h
+++ b/src/qml/jsruntime/qv4mm_p.h
diff --git a/src/qml/qml/v4/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index 266fa792dc..266fa792dc 100644
--- a/src/qml/qml/v4/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
diff --git a/src/qml/qml/v4/qv4numberobject_p.h b/src/qml/jsruntime/qv4numberobject_p.h
index 0c06451c98..0c06451c98 100644
--- a/src/qml/qml/v4/qv4numberobject_p.h
+++ b/src/qml/jsruntime/qv4numberobject_p.h
diff --git a/src/qml/qml/v4/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index edfb535e7a..edfb535e7a 100644
--- a/src/qml/qml/v4/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
diff --git a/src/qml/qml/v4/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 8d064adcaa..a9f947b629 100644
--- a/src/qml/qml/v4/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -47,8 +47,6 @@
#include "qv4context_p.h"
#include "qv4sparsearray_p.h"
#include "qv4string_p.h"
-#include "qv4codegen_p.h"
-#include "qv4isel_p.h"
#include "qv4managed_p.h"
#include "qv4property_p.h"
#include "qv4internalclass_p.h"
diff --git a/src/qml/qml/v4/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp
index a89bfdb797..a89bfdb797 100644
--- a/src/qml/qml/v4/qv4objectiterator.cpp
+++ b/src/qml/jsruntime/qv4objectiterator.cpp
diff --git a/src/qml/qml/v4/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h
index 95439397f5..95439397f5 100644
--- a/src/qml/qml/v4/qv4objectiterator_p.h
+++ b/src/qml/jsruntime/qv4objectiterator_p.h
diff --git a/src/qml/qml/v4/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 462c9ca81e..462c9ca81e 100644
--- a/src/qml/qml/v4/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
diff --git a/src/qml/qml/v4/qv4objectproto_p.h b/src/qml/jsruntime/qv4objectproto_p.h
index ca2e77ca42..ca2e77ca42 100644
--- a/src/qml/qml/v4/qv4objectproto_p.h
+++ b/src/qml/jsruntime/qv4objectproto_p.h
diff --git a/src/qml/qml/v4/qv4property_p.h b/src/qml/jsruntime/qv4property_p.h
index 024ad3c720..024ad3c720 100644
--- a/src/qml/qml/v4/qv4property_p.h
+++ b/src/qml/jsruntime/qv4property_p.h
diff --git a/src/qml/qml/v4/qv4qmlextensions.cpp b/src/qml/jsruntime/qv4qmlextensions.cpp
index a55330ff67..a55330ff67 100644
--- a/src/qml/qml/v4/qv4qmlextensions.cpp
+++ b/src/qml/jsruntime/qv4qmlextensions.cpp
diff --git a/src/qml/qml/v4/qv4qmlextensions_p.h b/src/qml/jsruntime/qv4qmlextensions_p.h
index cf9e287efe..cf9e287efe 100644
--- a/src/qml/qml/v4/qv4qmlextensions_p.h
+++ b/src/qml/jsruntime/qv4qmlextensions_p.h
diff --git a/src/qml/qml/v4/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index f79675845b..f79675845b 100644
--- a/src/qml/qml/v4/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
diff --git a/src/qml/qml/v4/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index 6580d19fe9..6580d19fe9 100644
--- a/src/qml/qml/v4/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
diff --git a/src/qml/qml/v4/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index ab01ce7650..ab01ce7650 100644
--- a/src/qml/qml/v4/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
diff --git a/src/qml/qml/v4/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
index 6edbd4b2ad..6edbd4b2ad 100644
--- a/src/qml/qml/v4/qv4regexp_p.h
+++ b/src/qml/jsruntime/qv4regexp_p.h
diff --git a/src/qml/qml/v4/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 0dc14e5722..0dc14e5722 100644
--- a/src/qml/qml/v4/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
diff --git a/src/qml/qml/v4/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index 0b9b7122a9..0b9b7122a9 100644
--- a/src/qml/qml/v4/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
diff --git a/src/qml/qml/v4/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index ed2c1468ee..ed2c1468ee 100644
--- a/src/qml/qml/v4/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
diff --git a/src/qml/qml/v4/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index 836aedf298..836aedf298 100644
--- a/src/qml/qml/v4/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
diff --git a/src/qml/qml/v4/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 3de218a451..3de218a451 100644
--- a/src/qml/qml/v4/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
diff --git a/src/qml/qml/v4/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 274a87db26..274a87db26 100644
--- a/src/qml/qml/v4/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
diff --git a/src/qml/qml/v4/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index c4d9a71519..c4d9a71519 100644
--- a/src/qml/qml/v4/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
diff --git a/src/qml/qml/v4/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h
index 2cade45092..2cade45092 100644
--- a/src/qml/qml/v4/qv4sequenceobject_p.h
+++ b/src/qml/jsruntime/qv4sequenceobject_p.h
diff --git a/src/qml/qml/v4/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp
index f7389dc6d7..f7389dc6d7 100644
--- a/src/qml/qml/v4/qv4serialize.cpp
+++ b/src/qml/jsruntime/qv4serialize.cpp
diff --git a/src/qml/qml/v4/qv4serialize_p.h b/src/qml/jsruntime/qv4serialize_p.h
index 5a04c9d25f..5a04c9d25f 100644
--- a/src/qml/qml/v4/qv4serialize_p.h
+++ b/src/qml/jsruntime/qv4serialize_p.h
diff --git a/src/qml/qml/v4/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp
index 835a0d004f..835a0d004f 100644
--- a/src/qml/qml/v4/qv4sparsearray.cpp
+++ b/src/qml/jsruntime/qv4sparsearray.cpp
diff --git a/src/qml/qml/v4/qv4sparsearray_p.h b/src/qml/jsruntime/qv4sparsearray_p.h
index 384d2ef045..384d2ef045 100644
--- a/src/qml/qml/v4/qv4sparsearray_p.h
+++ b/src/qml/jsruntime/qv4sparsearray_p.h
diff --git a/src/qml/qml/v4/qv4stacktrace.cpp b/src/qml/jsruntime/qv4stacktrace.cpp
index 1cc2e53556..1cc2e53556 100644
--- a/src/qml/qml/v4/qv4stacktrace.cpp
+++ b/src/qml/jsruntime/qv4stacktrace.cpp
diff --git a/src/qml/qml/v4/qv4stacktrace_p.h b/src/qml/jsruntime/qv4stacktrace_p.h
index 79cb4d1813..79cb4d1813 100644
--- a/src/qml/qml/v4/qv4stacktrace_p.h
+++ b/src/qml/jsruntime/qv4stacktrace_p.h
diff --git a/src/qml/qml/v4/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 8b78c40129..8b78c40129 100644
--- a/src/qml/qml/v4/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
diff --git a/src/qml/qml/v4/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index 31e5c2a5f7..31e5c2a5f7 100644
--- a/src/qml/qml/v4/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
diff --git a/src/qml/qml/v4/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 5afedd3d4f..5afedd3d4f 100644
--- a/src/qml/qml/v4/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
diff --git a/src/qml/qml/v4/qv4stringobject_p.h b/src/qml/jsruntime/qv4stringobject_p.h
index 0ef6596235..0ef6596235 100644
--- a/src/qml/qml/v4/qv4stringobject_p.h
+++ b/src/qml/jsruntime/qv4stringobject_p.h
diff --git a/src/qml/qml/v4/qv4unwindhelper.cpp b/src/qml/jsruntime/qv4unwindhelper.cpp
index beb5132626..beb5132626 100644
--- a/src/qml/qml/v4/qv4unwindhelper.cpp
+++ b/src/qml/jsruntime/qv4unwindhelper.cpp
diff --git a/src/qml/qml/v4/qv4unwindhelper_p-arm.h b/src/qml/jsruntime/qv4unwindhelper_p-arm.h
index dd1f1e4856..dd1f1e4856 100644
--- a/src/qml/qml/v4/qv4unwindhelper_p-arm.h
+++ b/src/qml/jsruntime/qv4unwindhelper_p-arm.h
diff --git a/src/qml/qml/v4/qv4unwindhelper_p-dw2.h b/src/qml/jsruntime/qv4unwindhelper_p-dw2.h
index 57615f0999..57615f0999 100644
--- a/src/qml/qml/v4/qv4unwindhelper_p-dw2.h
+++ b/src/qml/jsruntime/qv4unwindhelper_p-dw2.h
diff --git a/src/qml/qml/v4/qv4unwindhelper_p.h b/src/qml/jsruntime/qv4unwindhelper_p.h
index 9ef564449a..9ef564449a 100644
--- a/src/qml/qml/v4/qv4unwindhelper_p.h
+++ b/src/qml/jsruntime/qv4unwindhelper_p.h
diff --git a/src/qml/qml/v4/qv4util_p.h b/src/qml/jsruntime/qv4util_p.h
index dbd9f89faa..dbd9f89faa 100644
--- a/src/qml/qml/v4/qv4util_p.h
+++ b/src/qml/jsruntime/qv4util_p.h
diff --git a/src/qml/qml/v4/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp
index a41262f12f..a41262f12f 100644
--- a/src/qml/qml/v4/qv4value.cpp
+++ b/src/qml/jsruntime/qv4value.cpp
diff --git a/src/qml/qml/v4/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h
index a44af16b6a..a44af16b6a 100644
--- a/src/qml/qml/v4/qv4value_def_p.h
+++ b/src/qml/jsruntime/qv4value_def_p.h
diff --git a/src/qml/qml/v4/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 2a783ed34b..2a783ed34b 100644
--- a/src/qml/qml/v4/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
diff --git a/src/qml/qml/v4/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index f18c5b582e..f18c5b582e 100644
--- a/src/qml/qml/v4/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
diff --git a/src/qml/qml/v4/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index 876539aae1..876539aae1 100644
--- a/src/qml/qml/v4/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index adbb2c7639..c046c6105a 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -21,6 +21,8 @@ HEADERS += qtqmlglobal.h \
#modules
include(util/util.pri)
+include(compiler/compiler.pri)
+include(jsruntime/jsruntime.pri)
include(qml/qml.pri)
include(debugger/debugger.pri)
include(animations/animations.pri)
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index 3a18d02871..1914a388d0 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -136,4 +136,3 @@ include(parser/parser.pri)
include(rewriter/rewriter.pri)
include(ftw/ftw.pri)
include(v8/v8.pri)
-include(v4/v4.pri)
diff --git a/src/qml/qml/v4/moth/moth.pri b/src/qml/qml/v4/moth/moth.pri
deleted file mode 100644
index 73bd893286..0000000000
--- a/src/qml/qml/v4/moth/moth.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
- $$PWD/qv4isel_moth_p.h \
- $$PWD/qv4instr_moth_p.h \
- $$PWD/qv4vme_moth_p.h
-
-SOURCES += \
- $$PWD/qv4isel_moth.cpp \
- $$PWD/qv4instr_moth.cpp \
- $$PWD/qv4vme_moth.cpp
-
-#DEFINES += DO_TRACE_INSTR
diff --git a/src/qml/qml/v4/qv4syntaxchecker.cpp b/src/qml/qml/v4/qv4syntaxchecker.cpp
deleted file mode 100644
index a4f7423cd7..0000000000
--- a/src/qml/qml/v4/qv4syntaxchecker.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qv4syntaxchecker_p.h"
-
-QT_BEGIN_NAMESPACE
-
-using namespace QQmlJS;
-
-SyntaxChecker::SyntaxChecker()
- : Lexer(&m_engine)
- , m_stateStack(128)
-{
-}
-
-void QQmlJS::SyntaxChecker::clearText()
-{
- m_code.clear();
- m_tokens.clear();
-}
-
-void SyntaxChecker::appendText(const QString &text)
-{
- m_code += text;
-}
-
-QString SyntaxChecker::text() const
-{
- return m_code;
-}
-
-bool SyntaxChecker::canEvaluate()
-{
- int yyaction = 0;
- int yytoken = -1;
- int yytos = -1;
-
- setCode(m_code, 1);
-
- m_tokens.clear();
- m_tokens.append(T_FEED_JS_PROGRAM);
-
- do {
- if (++yytos == m_stateStack.size())
- m_stateStack.resize(m_stateStack.size() * 2);
-
- m_stateStack[yytos] = yyaction;
-
-again:
- if (yytoken == -1 && action_index[yyaction] != -TERMINAL_COUNT) {
- if (m_tokens.isEmpty())
- yytoken = lex();
- else
- yytoken = m_tokens.takeFirst();
- }
-
- yyaction = t_action(yyaction, yytoken);
- if (yyaction > 0) {
- if (yyaction == ACCEPT_STATE) {
- --yytos;
- return true;
- }
- yytoken = -1;
- } else if (yyaction < 0) {
- const int ruleno = -yyaction - 1;
- yytos -= rhs[ruleno];
- yyaction = nt_action(m_stateStack[yytos], lhs[ruleno] - TERMINAL_COUNT);
- }
- } while (yyaction);
-
- const int errorState = m_stateStack[yytos];
- if (t_action(errorState, T_AUTOMATIC_SEMICOLON) && canInsertAutomaticSemicolon(yytoken)) {
- yyaction = errorState;
- m_tokens.prepend(yytoken);
- yytoken = T_SEMICOLON;
- goto again;
- }
-
- if (yytoken != EOF_SYMBOL)
- return true;
-
- return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/qml/qml/v4/qv4syntaxchecker_p.h b/src/qml/qml/v4/qv4syntaxchecker_p.h
deleted file mode 100644
index bdb88b0525..0000000000
--- a/src/qml/qml/v4/qv4syntaxchecker_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QV4SYNTAXCHECKER_P_H
-#define QV4SYNTAXCHECKER_P_H
-
-#include <private/qqmljslexer_p.h>
-#include <private/qqmljsengine_p.h>
-
-#include <QtCore/QVector>
-#include <QtCore/QString>
-#include <QtCore/QList>
-
-QT_BEGIN_NAMESPACE
-
-namespace QQmlJS {
-
-class SyntaxChecker: Lexer
-{
-public:
- SyntaxChecker();
-
- QString text() const;
- void clearText();
- void appendText(const QString &text);
-
- bool canEvaluate();
-
-private:
- Engine m_engine;
- QVector<int> m_stateStack;
- QList<int> m_tokens;
- QString m_code;
-};
-
-} // end of QQmlJS namespace
-
-QT_END_NAMESPACE
-
-#endif // QV4SYNTAXCHECKER_P_H