1 files changed, 19 insertions, 28 deletions

diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index a24ee0a188..32acc6affc 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 INCLUDEPATH += $$OUT_PWD
 
-!qmldevtools_build {
 SOURCES += \
+    $$PWD/qv4engine.cpp \
     $$PWD/qv4context.cpp \
     $$PWD/qv4persistent.cpp \
     $$PWD/qv4lookup.cpp \
@@ -36,13 +36,13 @@ SOURCES += \
     $$PWD/qv4reflect.cpp \
     $$PWD/qv4regexpobject.cpp \
     $$PWD/qv4stackframe.cpp \
+    $$PWD/qv4string.cpp \
     $$PWD/qv4stringiterator.cpp \
     $$PWD/qv4stringobject.cpp \
     $$PWD/qv4variantobject.cpp \
     $$PWD/qv4objectiterator.cpp \
     $$PWD/qv4regexp.cpp \
     $$PWD/qv4runtimecodegen.cpp \
-    $$PWD/qv4serialize.cpp \
     $$PWD/qv4script.cpp \
     $$PWD/qv4symbol.cpp \
     $$PWD/qv4setobject.cpp \
@@ -57,13 +57,17 @@ SOURCES += \
     $$PWD/qv4mapiterator.cpp \
     $$PWD/qv4estable.cpp \
     $$PWD/qv4module.cpp \
-    $$PWD/qv4promiseobject.cpp
+    $$PWD/qv4promiseobject.cpp \
+    $$PWD/qv4runtime.cpp \
+    $$PWD/qv4value.cpp \
+    $$PWD/qv4compilationunitmapper.cpp \
+    $$PWD/qv4executablecompilationunit.cpp \
+    $$PWD/qv4executableallocator.cpp
 
 qtConfig(qml-debug): SOURCES += $$PWD/qv4profiling.cpp
 
 HEADERS += \
     $$PWD/qv4global_p.h \
-    $$PWD/qv4alloca_p.h \
     $$PWD/qv4engine_p.h \
     $$PWD/qv4enginebase_p.h \
     $$PWD/qv4context_p.h \
@@ -103,13 +107,13 @@ HEADERS += \
     $$PWD/qv4regexpobject_p.h \
     $$PWD/qv4runtimecodegen_p.h \
     $$PWD/qv4stackframe_p.h \
+    $$PWD/qv4string_p.h \
     $$PWD/qv4stringiterator_p.h \
     $$PWD/qv4stringobject_p.h \
     $$PWD/qv4variantobject_p.h \
     $$PWD/qv4property_p.h \
     $$PWD/qv4objectiterator_p.h \
     $$PWD/qv4regexp_p.h \
-    $$PWD/qv4serialize_p.h \
     $$PWD/qv4script_p.h \
     $$PWD/qv4symbol_p.h \
     $$PWD/qv4setobject_p.h \
@@ -128,7 +132,13 @@ HEADERS += \
     $$PWD/qv4estable_p.h \
     $$PWD/qv4vtable_p.h \
     $$PWD/qv4module_p.h \
-    $$PWD/qv4promiseobject_p.h
+    $$PWD/qv4promiseobject_p.h \
+    $$PWD/qv4runtime_p.h \
+    $$PWD/qv4value_p.h \
+    $$PWD/qv4compilationunitmapper_p.h \
+    $$PWD/qv4executablecompilationunit_p.h \
+    $$PWD/qv4functiontable_p.h \
+    $$PWD/qv4runtimeapi_p.h
 
 qtConfig(qml-sequence-object) {
     HEADERS += \
@@ -138,29 +148,10 @@ qtConfig(qml-sequence-object) {
         $$PWD/qv4sequenceobject.cpp
 }
 
-}
-
-
-HEADERS += \
-    $$PWD/qv4runtime_p.h \
-    $$PWD/qv4runtimeapi_p.h \
-    $$PWD/qv4value_p.h \
-    $$PWD/qv4string_p.h \
-    $$PWD/qv4util_p.h \
-    $$PWD/qv4value_p.h \
-    $$PWD/qv4functiontable_p.h
-
-SOURCES += \
-    $$PWD/qv4engine.cpp \
-    $$PWD/qv4runtime.cpp \
-    $$PWD/qv4string.cpp \
-    $$PWD/qv4value.cpp \
-    $$PWD/qv4executableallocator.cpp
+unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp
+else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp
 
-qmldevtools_build {
-    SOURCES += \
-        $$PWD/qv4functiontable_noop.cpp
-} else:win32 {
+win32 {
     !winrt:equals(QT_ARCH, x86_64) {
         SOURCES += \
             $$PWD/qv4functiontable_win64.cpp