aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-04-15 11:50:16 +0200
committerLars Knoll <lars.knoll@digia.com>2013-04-15 13:03:20 +0200
commit891f7029457c5135c365ec32c06e7750abaceeab (patch)
tree0bf15a932ea3176b7b7da2fd6276c00e1da9d9b5
parentdb78a10ea2537141e58740bd179db19183d236e8 (diff)
Fix compilation with built-in v4vm JS engine
Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--.gitignore8
-rw-r--r--src/3rdparty/masm/stubs/ExecutableAllocator.h2
-rw-r--r--src/imports/folderlistmodel/folderlistmodel.pro2
-rw-r--r--src/imports/localstorage/localstorage.pro2
-rw-r--r--src/imports/testlib/testlib.pro2
-rw-r--r--src/imports/widgets/widgets.pro2
-rw-r--r--src/imports/xmllistmodel/xmllistmodel.pro2
-rw-r--r--src/particles/particles.pro1
-rw-r--r--src/plugins/accessible/quick/quick.pro2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro2
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro2
-rw-r--r--src/qml/qml.pro1
-rw-r--r--src/qml/qml/ftw/qhashedstring_p.h2
-rw-r--r--src/qml/qml/qml.pri1
-rw-r--r--src/qml/qml/v4vm/llvm_runtime.cpp6
-rw-r--r--src/qml/qml/v4vm/moth/qv4instr_moth_p.h2
-rw-r--r--src/qml/qml/v4vm/moth/qv4isel_moth.cpp6
-rw-r--r--src/qml/qml/v4vm/moth/qv4isel_moth_p.h8
-rw-r--r--src/qml/qml/v4vm/moth/qv4vme_moth.cpp4
-rw-r--r--src/qml/qml/v4vm/moth/qv4vme_moth_p.h2
-rw-r--r--src/qml/qml/v4vm/qcalculatehash_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4_llvm_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4argumentsobject.cpp2
-rw-r--r--src/qml/qml/v4vm/qv4argumentsobject_p.h (renamed from src/qml/qml/v4vm/qv4argumentsobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4arrayobject.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4arrayobject_p.h (renamed from src/qml/qml/v4vm/qv4arrayobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4booleanobject.cpp2
-rw-r--r--src/qml/qml/v4vm/qv4booleanobject_p.h (renamed from src/qml/qml/v4vm/qv4booleanobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4codegen.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4codegen_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4context.cpp12
-rw-r--r--src/qml/qml/v4vm/qv4context_p.h (renamed from src/qml/qml/v4vm/qv4context.h)4
-rw-r--r--src/qml/qml/v4vm/qv4dateobject.cpp6
-rw-r--r--src/qml/qml/v4vm/qv4dateobject_p.h (renamed from src/qml/qml/v4vm/qv4dateobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4debugging.cpp (renamed from src/qml/qml/v4vm/debugging.cpp)6
-rw-r--r--src/qml/qml/v4vm/qv4debugging_p.h (renamed from src/qml/qml/v4vm/debugging.h)6
-rw-r--r--src/qml/qml/v4vm/qv4engine.cpp44
-rw-r--r--src/qml/qml/v4vm/qv4engine_p.h (renamed from src/qml/qml/v4vm/qv4engine.h)10
-rw-r--r--src/qml/qml/v4vm/qv4errorobject.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4errorobject_p.h (renamed from src/qml/qml/v4vm/qv4errorobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4executableallocator.cpp2
-rw-r--r--src/qml/qml/v4vm/qv4executableallocator_p.h (renamed from src/qml/qml/v4vm/qv4executableallocator.h)2
-rw-r--r--src/qml/qml/v4vm/qv4functionobject.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4functionobject_p.h (renamed from src/qml/qml/v4vm/qv4functionobject.h)20
-rw-r--r--src/qml/qml/v4vm/qv4global_p.h (renamed from src/qml/qml/v4vm/qv4global.h)0
-rw-r--r--src/qml/qml/v4vm/qv4globalobject.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4globalobject_p.h (renamed from src/qml/qml/v4vm/qv4globalobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4identifier_p.h (renamed from src/qml/qml/v4vm/qv4identifier.h)4
-rw-r--r--src/qml/qml/v4vm/qv4internalclass.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4internalclass_p.h (renamed from src/qml/qml/v4vm/qv4internalclass.h)2
-rw-r--r--src/qml/qml/v4vm/qv4isel_llvm.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4isel_masm.cpp12
-rw-r--r--src/qml/qml/v4vm/qv4isel_masm_p.h6
-rw-r--r--src/qml/qml/v4vm/qv4isel_p.cpp6
-rw-r--r--src/qml/qml/v4vm/qv4isel_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4isel_util_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4jsir_p.h2
-rw-r--r--src/qml/qml/v4vm/qv4jsonobject.cpp12
-rw-r--r--src/qml/qml/v4vm/qv4jsonobject_p.h (renamed from src/qml/qml/v4vm/qv4jsonobject.h)2
-rw-r--r--src/qml/qml/v4vm/qv4lookup.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4lookup_p.h (renamed from src/qml/qml/v4vm/qv4lookup.h)12
-rw-r--r--src/qml/qml/v4vm/qv4managed.cpp6
-rw-r--r--src/qml/qml/v4vm/qv4managed_p.h (renamed from src/qml/qml/v4vm/qv4managed.h)2
-rw-r--r--src/qml/qml/v4vm/qv4math_p.h (renamed from src/qml/qml/v4vm/qv4math.h)0
-rw-r--r--src/qml/qml/v4vm/qv4mathobject.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4mathobject_p.h (renamed from src/qml/qml/v4vm/qv4mathobject.h)2
-rw-r--r--src/qml/qml/v4vm/qv4mm.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4mm_p.h (renamed from src/qml/qml/v4vm/qv4mm.h)4
-rw-r--r--src/qml/qml/v4vm/qv4numberobject.cpp2
-rw-r--r--src/qml/qml/v4vm/qv4numberobject_p.h (renamed from src/qml/qml/v4vm/qv4numberobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4object.cpp10
-rw-r--r--src/qml/qml/v4vm/qv4object_p.h (renamed from src/qml/qml/v4vm/qv4object.h)20
-rw-r--r--src/qml/qml/v4vm/qv4objectiterator.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4objectiterator_p.h (renamed from src/qml/qml/v4vm/qv4objectiterator.h)6
-rw-r--r--src/qml/qml/v4vm/qv4objectproto.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4objectproto_p.h (renamed from src/qml/qml/v4vm/qv4objectproto.h)4
-rw-r--r--src/qml/qml/v4vm/qv4property_p.h (renamed from src/qml/qml/v4vm/qv4property.h)6
-rw-r--r--src/qml/qml/v4vm/qv4regexp.cpp4
-rw-r--r--src/qml/qml/v4vm/qv4regexp_p.h (renamed from src/qml/qml/v4vm/qv4regexp.h)4
-rw-r--r--src/qml/qml/v4vm/qv4regexpobject.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4regexpobject_p.h (renamed from src/qml/qml/v4vm/qv4regexpobject.h)18
-rw-r--r--src/qml/qml/v4vm/qv4runtime.cpp16
-rw-r--r--src/qml/qml/v4vm/qv4runtime_p.h (renamed from src/qml/qml/v4vm/qv4runtime.h)6
-rw-r--r--src/qml/qml/v4vm/qv4sparsearray.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4sparsearray_p.h (renamed from src/qml/qml/v4vm/qv4sparsearray.h)6
-rw-r--r--src/qml/qml/v4vm/qv4string.cpp10
-rw-r--r--src/qml/qml/v4vm/qv4string_p.h (renamed from src/qml/qml/v4vm/qv4string.h)2
-rw-r--r--src/qml/qml/v4vm/qv4stringobject.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4stringobject_p.h (renamed from src/qml/qml/v4vm/qv4stringobject.h)4
-rw-r--r--src/qml/qml/v4vm/qv4unwindhelper.cpp2
-rw-r--r--src/qml/qml/v4vm/qv4unwindhelper_p-arm.h4
-rw-r--r--src/qml/qml/v4vm/qv4unwindhelper_p-dw2.h4
-rw-r--r--src/qml/qml/v4vm/qv4unwindhelper_p.h (renamed from src/qml/qml/v4vm/qv4unwindhelper.h)0
-rw-r--r--src/qml/qml/v4vm/qv4util_p.h (renamed from src/qml/qml/v4vm/qv4util.h)2
-rw-r--r--src/qml/qml/v4vm/qv4v8.cpp30
-rw-r--r--src/qml/qml/v4vm/qv4v8_p.h (renamed from src/qml/qml/v4vm/qv4v8.h)4
-rw-r--r--src/qml/qml/v4vm/qv4value.cpp8
-rw-r--r--src/qml/qml/v4vm/qv4value_p.h (renamed from src/qml/qml/v4vm/qv4value.h)6
-rw-r--r--src/qml/qml/v4vm/v4.pri8
-rw-r--r--src/qml/qml/v4vm/v4.pro177
-rw-r--r--src/qml/qml/v4vm/v4vm.pri158
-rw-r--r--src/qml/qml/v8/qv8_p.h2
-rw-r--r--src/qmltest/qmltest.pro2
-rw-r--r--src/quick/quick.pro2
-rw-r--r--sync.profile1
-rw-r--r--tests/auto/particles/qquickage/qquickage.pro2
-rw-r--r--tests/auto/particles/qquickangleddirection/qquickangleddirection.pro2
-rw-r--r--tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro2
-rw-r--r--tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro2
-rw-r--r--tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro2
-rw-r--r--tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro2
-rw-r--r--tests/auto/particles/qquickfriction/qquickfriction.pro2
-rw-r--r--tests/auto/particles/qquickgravity/qquickgravity.pro2
-rw-r--r--tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro2
-rw-r--r--tests/auto/particles/qquickimageparticle/qquickimageparticle.pro2
-rw-r--r--tests/auto/particles/qquickitemparticle/qquickitemparticle.pro2
-rw-r--r--tests/auto/particles/qquicklineextruder/qquicklineextruder.pro2
-rw-r--r--tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro2
-rw-r--r--tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro2
-rw-r--r--tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro2
-rw-r--r--tests/auto/particles/qquickpointattractor/qquickpointattractor.pro2
-rw-r--r--tests/auto/particles/qquickpointdirection/qquickpointdirection.pro2
-rw-r--r--tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro2
-rw-r--r--tests/auto/particles/qquickspritegoal/qquickspritegoal.pro2
-rw-r--r--tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro2
-rw-r--r--tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro2
-rw-r--r--tests/auto/particles/qquickturbulence/qquickturbulence.pro2
-rw-r--r--tests/auto/particles/qquickwander/qquickwander.pro2
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro2
-rw-r--r--tests/auto/qml/qjsengine/qjsengine.pro2
-rw-r--r--tests/auto/qml/qjsengine/tst_qjsengine.cpp2
-rw-r--r--tests/auto/qml/qqmlconnections/qqmlconnections.pro2
-rw-r--r--tests/auto/qml/qqmlcontext/qqmlcontext.pro2
-rw-r--r--tests/auto/qml/qqmlcpputils/qqmlcpputils.pro2
-rw-r--r--tests/auto/qml/qqmldirparser/qqmldirparser.pro2
-rw-r--r--tests/auto/qml/qqmlecmascript/qqmlecmascript.pro2
-rw-r--r--tests/auto/qml/qqmlengine/qqmlengine.pro2
-rw-r--r--tests/auto/qml/qqmlglobal/qqmlglobal.pro2
-rw-r--r--tests/auto/qml/qqmlincubator/qqmlincubator.pro2
-rw-r--r--tests/auto/qml/qqmlinstruction/qqmlinstruction.pro2
-rw-r--r--tests/auto/qml/qqmllanguage/qqmllanguage.pro2
-rw-r--r--tests/auto/qml/qqmllistmodel/qqmllistmodel.pro2
-rw-r--r--tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro2
-rw-r--r--tests/auto/qml/qqmlmetatype/qqmlmetatype.pro2
-rw-r--r--tests/auto/qml/qqmlproperty/qqmlproperty.pro2
-rw-r--r--tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro2
-rw-r--r--tests/auto/qml/qqmlqt/qqmlqt.pro2
-rw-r--r--tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro2
-rw-r--r--tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro2
-rw-r--r--tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro2
-rw-r--r--tests/auto/qml/qquickworkerscript/qquickworkerscript.pro2
-rw-r--r--tests/auto/qml/qtqmlmodules/qtqmlmodules.pro2
-rw-r--r--tests/auto/qml/v4/v4.pro2
-rw-r--r--tests/auto/quick/dialogs/dialogs.pro2
-rw-r--r--tests/auto/quick/examples/examples.pro2
-rw-r--r--tests/auto/quick/qquickanchors/qquickanchors.pro2
-rw-r--r--tests/auto/quick/qquickanimations/qquickanimations.pro2
-rw-r--r--tests/auto/quick/qquickbehaviors/qquickbehaviors.pro2
-rw-r--r--tests/auto/quick/qquickflickable/qquickflickable.pro2
-rw-r--r--tests/auto/quick/qquickflipable/qquickflipable.pro2
-rw-r--r--tests/auto/quick/qquickgridview/qquickgridview.pro2
-rw-r--r--tests/auto/quick/qquickitem/qquickitem.pro2
-rw-r--r--tests/auto/quick/qquickitem2/qquickitem2.pro2
-rw-r--r--tests/auto/quick/qquickitemlayer/qquickitemlayer.pro2
-rw-r--r--tests/auto/quick/qquicklistview/qquicklistview.pro2
-rw-r--r--tests/auto/quick/qquickpainteditem/qquickpainteditem.pro2
-rw-r--r--tests/auto/quick/qquickpath/qquickpath.pro2
-rw-r--r--tests/auto/quick/qquickpathview/qquickpathview.pro2
-rw-r--r--tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro2
-rw-r--r--tests/auto/quick/qquickspringanimation/qquickspringanimation.pro2
-rw-r--r--tests/auto/quick/qquickstates/qquickstates.pro2
-rw-r--r--tests/auto/quick/qquicktext/qquicktext.pro2
-rw-r--r--tests/auto/quick/qquicktextedit/qquicktextedit.pro2
-rw-r--r--tests/auto/quick/qquicktextinput/qquicktextinput.pro2
-rw-r--r--tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro2
-rw-r--r--tests/auto/quick/qquickwindow/qquickwindow.pro2
-rw-r--r--tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro2
-rw-r--r--tests/auto/quick/rendernode/rendernode.pro2
-rw-r--r--tests/auto/quick/shared/util.pri2
-rw-r--r--tests/auto/quick/touchmouse/touchmouse.pro2
-rw-r--r--tests/benchmarks/particles/affectors/affectors.pro2
-rw-r--r--tests/benchmarks/particles/emission/emission.pro2
-rw-r--r--tests/benchmarks/qml/animation/animation.pro2
-rw-r--r--tests/benchmarks/qml/compilation/compilation.pro2
-rw-r--r--tests/benchmarks/qml/qquickwindow/qquickwindow.pro2
-rw-r--r--tests/benchmarks/qml/script/script.pro2
-rw-r--r--tests/benchmarks/script/qjsvalue/qjsvalue.pro2
-rw-r--r--tests/manual/v4/tests.pro17
-rw-r--r--tools/qmlbundle/qmlbundle.pro2
-rw-r--r--tools/qmlprofiler/qmlprofiler.pro2
-rw-r--r--tools/tools.pro3
-rw-r--r--tools/v4/main.cpp18
-rw-r--r--tools/v4/v4.pro6
193 files changed, 558 insertions, 563 deletions
diff --git a/.gitignore b/.gitignore
index 2f83627143..fa221a5ede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,3 +266,11 @@ tests/auto/*/*/*.moc
# Generated static plugin import sources
*_plugin_import.cpp
+
+# Compiled python code
+*.pyc
+
+src/qml/RegExpJitTables.h
+src/qml/udis86_itab.c
+src/qml/udis86_itab.h
+
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index f4292c791d..6ebea24a15 100644
--- a/src/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
@@ -45,7 +45,7 @@
#include <RefCounted.h>
#include <wtf/PageBlock.h>
-#include <qv4executableallocator.h>
+#include <private/qv4executableallocator_p.h>
#if OS(WINDOWS)
#include <windows.h>
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index c29f1f8ca5..c8c805adb6 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -3,7 +3,7 @@ TARGET = qmlfolderlistmodelplugin
TARGETPATH = Qt/labs/folderlistmodel
IMPORT_VERSION = 2.0
-QT = core-private qml-private v8-private
+QT = core-private qml-private
SOURCES += qquickfolderlistmodel.cpp plugin.cpp \
fileinfothread.cpp
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index c783404d0a..15753263b8 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -3,7 +3,7 @@ TARGET = qmllocalstorageplugin
TARGETPATH = QtQuick/LocalStorage
IMPORT_VERSION = 2.0
-QT = sql qml-private v8-private core-private
+QT = sql qml-private core-private
SOURCES += plugin.cpp
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 56f0ea4806..6e8a6aee72 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -3,7 +3,7 @@ TARGET = qmltestplugin
TARGETPATH = QtTest
IMPORT_VERSION = 1.0
-QT += qml quick qmltest qmltest-private v8-private qml-private core-private testlib
+QT += qml quick qmltest qmltest-private qml-private core-private testlib
SOURCES += main.cpp
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index c444674a75..7e6a04161a 100644
--- a/src/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -18,6 +18,6 @@ HEADERS += \
../dialogs/qquickabstractcolordialog_p.h \
../dialogs/qquickabstractdialog_p.h
-QT += quick-private gui-private core-private qml-private v8-private widgets
+QT += quick-private gui-private core-private qml-private widgets
load(qml_plugin)
diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro
index c2cb4bbd89..2308f26d1b 100644
--- a/src/imports/xmllistmodel/xmllistmodel.pro
+++ b/src/imports/xmllistmodel/xmllistmodel.pro
@@ -3,7 +3,7 @@ TARGET = qmlxmllistmodelplugin
TARGETPATH = QtQuick/XmlListModel
IMPORT_VERSION = 2.0
-QT = network xmlpatterns qml-private v8-private core-private
+QT = network xmlpatterns qml-private core-private
SOURCES += qqmlxmllistmodel.cpp plugin.cpp
HEADERS += qqmlxmllistmodel_p.h
diff --git a/src/particles/particles.pro b/src/particles/particles.pro
index 632856ccca..71be71ae25 100644
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -3,7 +3,6 @@ TARGET = QtQuickParticles
CONFIG += internal_module
QT = core-private gui-private qml-private quick-private
-QT_PRIVATE = v8-private
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index d3a730c396..eeececae8b 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -6,7 +6,7 @@ load(qt_plugin)
include ($$PWD/../shared/qaccessiblebase.pri)
-QT += core-private gui-private v8-private qml-private quick-private
+QT += core-private gui-private qml-private quick-private
#DEFINES+=Q_ACCESSIBLE_QUICK_ITEM_ENABLE_DEBUG_DESCRIPTION
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index d11ef590bd..2ee0d703b2 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -1,5 +1,5 @@
TARGET = qmldbg_qtquick2
-QT += qml-private quick-private core-private gui-private v8-private
+QT += qml-private quick-private core-private gui-private
PLUGIN_TYPE = qmltooling
PLUGIN_CLASS_NAME = QtQuick2Plugin
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index e9c97b875b..bd2b4bd52c 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,5 +1,5 @@
TARGET = qmldbg_tcp
-QT = qml-private network v8-private core-private
+QT = qml-private network core-private
PLUGIN_TYPE = qmltooling
PLUGIN_CLASS_NAME = QTcpServerConnection
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 8dbe0c65d1..adbb2c7639 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -1,6 +1,5 @@
TARGET = QtQml
QT = core-private network
-QT_PRIVATE = v8-private
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index cffa68e4cd..990fbc516f 100644
--- a/src/qml/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -56,7 +56,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qstring.h>
#include <private/qv8_p.h>
-#include <private/qv4string.h>
+#include <private/qv4string_p.h>
#include <private/qflagpointer_p.h>
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index aafc50db9b..d0026d409b 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -132,3 +132,4 @@ include(rewriter/rewriter.pri)
include(ftw/ftw.pri)
include(v4/v4.pri)
include(v8/v8.pri)
+include(v4vm/v4vm.pri)
diff --git a/src/qml/qml/v4vm/llvm_runtime.cpp b/src/qml/qml/v4vm/llvm_runtime.cpp
index 629ee4028c..4fd4a68688 100644
--- a/src/qml/qml/v4vm/llvm_runtime.cpp
+++ b/src/qml/qml/v4vm/llvm_runtime.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "qv4runtime.h"
-#include "qv4context.h"
-#include "qv4engine.h"
+#include "qv4runtime_p.h"
+#include "qv4context_p.h"
+#include "qv4engine_p.h"
#include <stdio.h>
#include <setjmp.h>
diff --git a/src/qml/qml/v4vm/moth/qv4instr_moth_p.h b/src/qml/qml/v4vm/moth/qv4instr_moth_p.h
index b29fb13a74..9909f727d6 100644
--- a/src/qml/qml/v4vm/moth/qv4instr_moth_p.h
+++ b/src/qml/qml/v4vm/moth/qv4instr_moth_p.h
@@ -2,7 +2,7 @@
#define QV4INSTR_MOTH_P_H
#include <QtCore/qglobal.h>
-#include "qv4object.h"
+#include <private/qv4object_p.h>
#define FOR_EACH_MOTH_INSTR(F) \
F(Ret, ret) \
diff --git a/src/qml/qml/v4vm/moth/qv4isel_moth.cpp b/src/qml/qml/v4vm/moth/qv4isel_moth.cpp
index 00ae4e1029..1e9316f49b 100644
--- a/src/qml/qml/v4vm/moth/qv4isel_moth.cpp
+++ b/src/qml/qml/v4vm/moth/qv4isel_moth.cpp
@@ -1,9 +1,9 @@
#include "qv4isel_util_p.h"
#include "qv4isel_moth_p.h"
#include "qv4vme_moth_p.h"
-#include "qv4functionobject.h"
-#include "qv4regexpobject.h"
-#include "debugging.h"
+#include <private/qv4functionobject_p.h>
+#include <private/qv4regexpobject_p.h>
+#include <private/qv4debugging_p.h>
using namespace QQmlJS;
using namespace QQmlJS::Moth;
diff --git a/src/qml/qml/v4vm/moth/qv4isel_moth_p.h b/src/qml/qml/v4vm/moth/qv4isel_moth_p.h
index 5e057139e2..e624e447d9 100644
--- a/src/qml/qml/v4vm/moth/qv4isel_moth_p.h
+++ b/src/qml/qml/v4vm/moth/qv4isel_moth_p.h
@@ -1,10 +1,10 @@
#ifndef QV4ISEL_MOTH_P_H
#define QV4ISEL_MOTH_P_H
-#include "qv4global.h"
-#include "qv4isel_p.h"
-#include "qv4jsir_p.h"
-#include "qv4object.h"
+#include <private/qv4global_p.h>
+#include <private/qv4isel_p.h>
+#include <private/qv4jsir_p.h>
+#include <private/qv4object_p.h>
#include "qv4instr_moth_p.h"
namespace QQmlJS {
diff --git a/src/qml/qml/v4vm/moth/qv4vme_moth.cpp b/src/qml/qml/v4vm/moth/qv4vme_moth.cpp
index a3c34bf340..198f623a64 100644
--- a/src/qml/qml/v4vm/moth/qv4vme_moth.cpp
+++ b/src/qml/qml/v4vm/moth/qv4vme_moth.cpp
@@ -1,7 +1,7 @@
#include "qv4vme_moth_p.h"
#include "qv4instr_moth_p.h"
-#include "qv4value.h"
-#include "debugging.h"
+#include <private/qv4value_p.h>
+#include <private/qv4debugging_p.h>
#include <iostream>
diff --git a/src/qml/qml/v4vm/moth/qv4vme_moth_p.h b/src/qml/qml/v4vm/moth/qv4vme_moth_p.h
index 9eea23901a..cdd5adfaa2 100644
--- a/src/qml/qml/v4vm/moth/qv4vme_moth_p.h
+++ b/src/qml/qml/v4vm/moth/qv4vme_moth_p.h
@@ -1,7 +1,7 @@
#ifndef QV4VME_MOTH_P_H
#define QV4VME_MOTH_P_H
-#include "qv4runtime.h"
+#include <private/qv4runtime_p.h>
#include "qv4instr_moth_p.h"
namespace QQmlJS {
diff --git a/src/qml/qml/v4vm/qcalculatehash_p.h b/src/qml/qml/v4vm/qcalculatehash_p.h
index 36c5a6807a..8cccc5d0d1 100644
--- a/src/qml/qml/v4vm/qcalculatehash_p.h
+++ b/src/qml/qml/v4vm/qcalculatehash_p.h
@@ -55,7 +55,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qstring.h>
-#include "qv4v8.h"
+#include "qv4v8_p.h"
QT_BEGIN_NAMESPACE
inline uint32_t calculateHash(const quint8* chars, int length)
diff --git a/src/qml/qml/v4vm/qv4_llvm_p.h b/src/qml/qml/v4vm/qv4_llvm_p.h
index 189fe8586f..10eef516b2 100644
--- a/src/qml/qml/v4vm/qv4_llvm_p.h
+++ b/src/qml/qml/v4vm/qv4_llvm_p.h
@@ -42,7 +42,7 @@
#ifndef QV4_LLVM_P_H
#define QV4_LLVM_P_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include "qv4jsir_p.h"
#include <QtCore/QString>
diff --git a/src/qml/qml/v4vm/qv4argumentsobject.cpp b/src/qml/qml/v4vm/qv4argumentsobject.cpp
index 21c72be460..7ae2441f1d 100644
--- a/src/qml/qml/v4vm/qv4argumentsobject.cpp
+++ b/src/qml/qml/v4vm/qv4argumentsobject.cpp
@@ -38,7 +38,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <qv4argumentsobject.h>
+#include <qv4argumentsobject_p.h>
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4argumentsobject.h b/src/qml/qml/v4vm/qv4argumentsobject_p.h
index 6727d8759b..fd5d5f7b89 100644
--- a/src/qml/qml/v4vm/qv4argumentsobject.h
+++ b/src/qml/qml/v4vm/qv4argumentsobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4ARGUMENTSOBJECTS_H
#define QV4ARGUMENTSOBJECTS_H
-#include <qv4object.h>
-#include <qv4functionobject.h>
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4arrayobject.cpp b/src/qml/qml/v4vm/qv4arrayobject.cpp
index 90746d008c..798bd6bd56 100644
--- a/src/qml/qml/v4vm/qv4arrayobject.cpp
+++ b/src/qml/qml/v4vm/qv4arrayobject.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qv4arrayobject.h"
-#include "qv4sparsearray.h"
+#include "qv4arrayobject_p.h"
+#include "qv4sparsearray_p.h"
using namespace QQmlJS::VM;
diff --git a/src/qml/qml/v4vm/qv4arrayobject.h b/src/qml/qml/v4vm/qv4arrayobject_p.h
index 86d14eb587..7771baee4e 100644
--- a/src/qml/qml/v4vm/qv4arrayobject.h
+++ b/src/qml/qml/v4vm/qv4arrayobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4ARRAYOBJECT_H
#define QV4ARRAYOBJECT_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4booleanobject.cpp b/src/qml/qml/v4vm/qv4booleanobject.cpp
index e449e5c7db..55bf45a971 100644
--- a/src/qml/qml/v4vm/qv4booleanobject.cpp
+++ b/src/qml/qml/v4vm/qv4booleanobject.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qv4booleanobject.h"
+#include "qv4booleanobject_p.h"
using namespace QQmlJS::VM;
diff --git a/src/qml/qml/v4vm/qv4booleanobject.h b/src/qml/qml/v4vm/qv4booleanobject_p.h
index 05b542590a..0a50621970 100644
--- a/src/qml/qml/v4vm/qv4booleanobject.h
+++ b/src/qml/qml/v4vm/qv4booleanobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4BOOLEANOBJECT_H
#define QBOOLEANOBJECT_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4codegen.cpp b/src/qml/qml/v4vm/qv4codegen.cpp
index c91458282f..feddcceef1 100644
--- a/src/qml/qml/v4vm/qv4codegen.cpp
+++ b/src/qml/qml/v4vm/qv4codegen.cpp
@@ -40,8 +40,8 @@
****************************************************************************/
#include "qv4codegen_p.h"
-#include "qv4util.h"
-#include "debugging.h"
+#include "qv4util_p.h"
+#include "qv4debugging_p.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QStringList>
@@ -50,8 +50,8 @@
#include <QtCore/QBitArray>
#include <QtCore/QStack>
#include <private/qqmljsast_p.h>
-#include <qv4runtime.h>
-#include <qv4context.h>
+#include <qv4runtime_p.h>
+#include <qv4context_p.h>
#include <cmath>
#include <iostream>
#include <cassert>
diff --git a/src/qml/qml/v4vm/qv4codegen_p.h b/src/qml/qml/v4vm/qv4codegen_p.h
index 031e75d207..ef47eb0a64 100644
--- a/src/qml/qml/v4vm/qv4codegen_p.h
+++ b/src/qml/qml/v4vm/qv4codegen_p.h
@@ -41,7 +41,7 @@
#ifndef QV4CODEGEN_P_H
#define QV4CODEGEN_P_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include "qv4jsir_p.h"
#include <private/qqmljsastvisitor_p.h>
#include <private/qqmljsast_p.h>
diff --git a/src/qml/qml/v4vm/qv4context.cpp b/src/qml/qml/v4vm/qv4context.cpp
index e1ce0016dd..7d8e87d793 100644
--- a/src/qml/qml/v4vm/qv4context.cpp
+++ b/src/qml/qml/v4vm/qv4context.cpp
@@ -40,12 +40,12 @@
****************************************************************************/
#include <QString>
-#include "debugging.h"
-#include <qv4context.h>
-#include <qv4object.h>
-#include <qv4objectproto.h>
-#include "qv4mm.h"
-#include <qv4argumentsobject.h>
+#include "qv4debugging_p.h"
+#include <qv4context_p.h>
+#include <qv4object_p.h>
+#include <qv4objectproto_p.h>
+#include "qv4mm_p.h"
+#include <qv4argumentsobject_p.h>
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4context.h b/src/qml/qml/v4vm/qv4context_p.h
index c26cc6bfc5..4337ca0f0a 100644
--- a/src/qml/qml/v4vm/qv4context.h
+++ b/src/qml/qml/v4vm/qv4context_p.h
@@ -41,8 +41,8 @@
#ifndef QMLJS_ENVIRONMENT_H
#define QMLJS_ENVIRONMENT_H
-#include "qv4global.h"
-#include <qv4runtime.h>
+#include "qv4global_p.h"
+#include "qv4runtime_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4dateobject.cpp b/src/qml/qml/v4vm/qv4dateobject.cpp
index adeb11f862..3de9d770c6 100644
--- a/src/qml/qml/v4vm/qv4dateobject.cpp
+++ b/src/qml/qml/v4vm/qv4dateobject.cpp
@@ -40,9 +40,9 @@
****************************************************************************/
-#include "qv4dateobject.h"
-#include "qv4objectproto.h"
-#include "qv4mm.h"
+#include "qv4dateobject_p.h"
+#include "qv4objectproto_p.h"
+#include "qv4mm_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>
#include <QtCore/QDateTime>
diff --git a/src/qml/qml/v4vm/qv4dateobject.h b/src/qml/qml/v4vm/qv4dateobject_p.h
index 49a879e809..4445b66502 100644
--- a/src/qml/qml/v4vm/qv4dateobject.h
+++ b/src/qml/qml/v4vm/qv4dateobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4DATEOBJECT_P_H
#define QV4DATEOBJECT_P_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/debugging.cpp b/src/qml/qml/v4vm/qv4debugging.cpp
index 6137e64f89..76190eb8c4 100644
--- a/src/qml/qml/v4vm/debugging.cpp
+++ b/src/qml/qml/v4vm/qv4debugging.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "debugging.h"
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4debugging_p.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <iostream>
#define LOW_LEVEL_DEBUGGING_HELPERS
diff --git a/src/qml/qml/v4vm/debugging.h b/src/qml/qml/v4vm/qv4debugging_p.h
index b337f41c51..1f7e907005 100644
--- a/src/qml/qml/v4vm/debugging.h
+++ b/src/qml/qml/v4vm/qv4debugging_p.h
@@ -42,9 +42,9 @@
#ifndef DEBUGGING_H
#define DEBUGGING_H
-#include "qv4global.h"
-#include "qv4engine.h"
-#include "qv4context.h"
+#include "qv4global_p.h"
+#include "qv4engine_p.h"
+#include "qv4context_p.h"
#include <QHash>
diff --git a/src/qml/qml/v4vm/qv4engine.cpp b/src/qml/qml/v4vm/qv4engine.cpp
index 7d5c79f333..a81b492345 100644
--- a/src/qml/qml/v4vm/qv4engine.cpp
+++ b/src/qml/qml/v4vm/qv4engine.cpp
@@ -38,29 +38,29 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <qv4engine.h>
-#include <qv4value.h>
-#include <qv4object.h>
-#include <qv4objectproto.h>
-#include <qv4arrayobject.h>
-#include <qv4booleanobject.h>
-#include <qv4globalobject.h>
-#include <qv4errorobject.h>
-#include <qv4functionobject.h>
-#include <qv4mathobject.h>
-#include <qv4numberobject.h>
-#include <qv4regexpobject.h>
-#include <qv4runtime.h>
-#include "qv4mm.h"
-#include <qv4argumentsobject.h>
-#include <qv4dateobject.h>
-#include <qv4jsonobject.h>
-#include <qv4stringobject.h>
-#include <qv4identifier.h>
-#include <qv4unwindhelper.h>
+#include <qv4engine_p.h>
+#include <qv4value_p.h>
+#include <qv4object_p.h>
+#include <qv4objectproto_p.h>
+#include <qv4arrayobject_p.h>
+#include <qv4booleanobject_p.h>
+#include <qv4globalobject_p.h>
+#include <qv4errorobject_p.h>
+#include <qv4functionobject_p.h>
+#include <qv4mathobject_p.h>
+#include <qv4numberobject_p.h>
+#include <qv4regexpobject_p.h>
+#include <qv4runtime_p.h>
+#include "qv4mm_p.h"
+#include <qv4argumentsobject_p.h>
+#include <qv4dateobject_p.h>
+#include <qv4jsonobject_p.h>
+#include <qv4stringobject_p.h>
+#include <qv4identifier_p.h>
+#include <qv4unwindhelper_p.h>
#include "qv4isel_masm_p.h"
-#include "debugging.h"
-#include "qv4executableallocator.h"
+#include "qv4debugging_p.h"
+#include "qv4executableallocator_p.h"
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4engine.h b/src/qml/qml/v4vm/qv4engine_p.h
index 538796eefa..d146562cbb 100644
--- a/src/qml/qml/v4vm/qv4engine.h
+++ b/src/qml/qml/v4vm/qv4engine_p.h
@@ -41,12 +41,12 @@
#ifndef QV4ENGINE_H
#define QV4ENGINE_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include "qv4isel_p.h"
-#include "qv4object.h"
-#include "qv4util.h"
-#include "qv4context.h"
-#include "qv4property.h"
+#include "qv4object_p.h"
+#include "qv4util_p.h"
+#include "qv4context_p.h"
+#include "qv4property_p.h"
#include <setjmp.h>
#include <wtf/BumpPointerAllocator.h>
diff --git a/src/qml/qml/v4vm/qv4errorobject.cpp b/src/qml/qml/v4vm/qv4errorobject.cpp
index b69262e77c..f12ddbaa08 100644
--- a/src/qml/qml/v4vm/qv4errorobject.cpp
+++ b/src/qml/qml/v4vm/qv4errorobject.cpp
@@ -40,8 +40,8 @@
****************************************************************************/
-#include "qv4errorobject.h"
-#include "qv4mm.h"
+#include "qv4errorobject_p.h"
+#include "qv4mm_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>
#include <QtCore/QDateTime>
diff --git a/src/qml/qml/v4vm/qv4errorobject.h b/src/qml/qml/v4vm/qv4errorobject_p.h
index 20a20ad980..90c4079271 100644
--- a/src/qml/qml/v4vm/qv4errorobject.h
+++ b/src/qml/qml/v4vm/qv4errorobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4ERROROBJECT_H
#define QV4ERROROBJECT_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4executableallocator.cpp b/src/qml/qml/v4vm/qv4executableallocator.cpp
index 2ad300a74b..f1b12ffdd1 100644
--- a/src/qml/qml/v4vm/qv4executableallocator.cpp
+++ b/src/qml/qml/v4vm/qv4executableallocator.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qv4executableallocator.h"
+#include "qv4executableallocator_p.h"
#include <assert.h>
#include <wtf/StdLibExtras.h>
diff --git a/src/qml/qml/v4vm/qv4executableallocator.h b/src/qml/qml/v4vm/qv4executableallocator_p.h
index 8e45288c54..b864652f72 100644
--- a/src/qml/qml/v4vm/qv4executableallocator.h
+++ b/src/qml/qml/v4vm/qv4executableallocator_p.h
@@ -42,7 +42,7 @@
#ifndef QV4EXECUTABLEALLOCATOR_H
#define QV4EXECUTABLEALLOCATOR_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include <QMultiMap>
#include <QHash>
diff --git a/src/qml/qml/v4vm/qv4functionobject.cpp b/src/qml/qml/v4vm/qv4functionobject.cpp
index 2380c1a994..dc16725702 100644
--- a/src/qml/qml/v4vm/qv4functionobject.cpp
+++ b/src/qml/qml/v4vm/qv4functionobject.cpp
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#include "qv4object.h"
+#include "qv4object_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
-#include "qv4objectproto.h"
-#include "qv4stringobject.h"
-#include "qv4mm.h"
+#include "qv4objectproto_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4mm_p.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>
diff --git a/src/qml/qml/v4vm/qv4functionobject.h b/src/qml/qml/v4vm/qv4functionobject_p.h
index 4dddc048f9..41fab34f4b 100644
--- a/src/qml/qml/v4vm/qv4functionobject.h
+++ b/src/qml/qml/v4vm/qv4functionobject_p.h
@@ -41,18 +41,18 @@
#ifndef QV4FUNCTIONOBJECT_H
#define QV4FUNCTIONOBJECT_H
-#include "qv4global.h"
-#include "qv4runtime.h"
-#include "qv4engine.h"
-#include "qv4context.h"
-#include "qv4object.h"
-#include "qv4string.h"
+#include "qv4global_p.h"
+#include "qv4runtime_p.h"
+#include "qv4engine_p.h"
+#include "qv4context_p.h"
+#include "qv4object_p.h"
+#include "qv4string_p.h"
#include "qv4codegen_p.h"
#include "qv4isel_p.h"
-#include "qv4managed.h"
-#include "qv4property.h"
-#include "qv4objectiterator.h"
-#include "qv4regexp.h"
+#include "qv4managed_p.h"
+#include "qv4property_p.h"
+#include "qv4objectiterator_p.h"
+#include "qv4regexp_p.h"
#include <QtCore/QString>
#include <QtCore/QHash>
diff --git a/src/qml/qml/v4vm/qv4global.h b/src/qml/qml/v4vm/qv4global_p.h
index 5f3f1b6d17..5f3f1b6d17 100644
--- a/src/qml/qml/v4vm/qv4global.h
+++ b/src/qml/qml/v4vm/qv4global_p.h
diff --git a/src/qml/qml/v4vm/qv4globalobject.cpp b/src/qml/qml/v4vm/qv4globalobject.cpp
index 75da51a9b6..d88b3f2e7f 100644
--- a/src/qml/qml/v4vm/qv4globalobject.cpp
+++ b/src/qml/qml/v4vm/qv4globalobject.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qv4globalobject.h"
-#include "qv4mm.h"
-#include "qv4value.h"
-#include "qv4context.h"
+#include "qv4globalobject_p.h"
+#include "qv4mm_p.h"
+#include "qv4value_p.h"
+#include "qv4context_p.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>
diff --git a/src/qml/qml/v4vm/qv4globalobject.h b/src/qml/qml/v4vm/qv4globalobject_p.h
index f9776f95cb..e11cd60542 100644
--- a/src/qml/qml/v4vm/qv4globalobject.h
+++ b/src/qml/qml/v4vm/qv4globalobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4GLOBALOBJECT_H
#define QV4GLOBALOBJECT_H
-#include "qv4global.h"
-#include "qv4functionobject.h"
+#include "qv4global_p.h"
+#include "qv4functionobject_p.h"
QT_END_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4identifier.h b/src/qml/qml/v4vm/qv4identifier_p.h
index 1467e80986..02dd9d5057 100644
--- a/src/qml/qml/v4vm/qv4identifier.h
+++ b/src/qml/qml/v4vm/qv4identifier_p.h
@@ -41,8 +41,8 @@
#ifndef QV4IDENTIFIER_H
#define QV4IDENTIFIER_H
-#include <qv4string.h>
-#include <qv4engine.h>
+#include "qv4string_p.h"
+#include "qv4engine_p.h"
#include <limits.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4internalclass.cpp b/src/qml/qml/v4vm/qv4internalclass.cpp
index 4d9bb93d0d..4c6fbc2282 100644
--- a/src/qml/qml/v4vm/qv4internalclass.cpp
+++ b/src/qml/qml/v4vm/qv4internalclass.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include <qv4internalclass.h>
-#include <qv4string.h>
-#include <qv4engine.h>
-#include <qv4identifier.h>
+#include <qv4internalclass_p.h>
+#include <qv4string_p.h>
+#include <qv4engine_p.h>
+#include <qv4identifier_p.h>
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4internalclass.h b/src/qml/qml/v4vm/qv4internalclass_p.h
index cc3b03190b..bf3654e1af 100644
--- a/src/qml/qml/v4vm/qv4internalclass.h
+++ b/src/qml/qml/v4vm/qv4internalclass_p.h
@@ -43,7 +43,7 @@
#include <QHash>
#include <QVector>
-#include <qv4global.h>
+#include "qv4global_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4isel_llvm.cpp b/src/qml/qml/v4vm/qv4isel_llvm.cpp
index 27614bae62..7ebd0ee953 100644
--- a/src/qml/qml/v4vm/qv4isel_llvm.cpp
+++ b/src/qml/qml/v4vm/qv4isel_llvm.cpp
@@ -79,8 +79,8 @@
#include "qv4isel_llvm_p.h"
#include "qv4_llvm_p.h"
#include "qv4jsir_p.h"
-#include "qv4string.h"
-#include "qv4global.h"
+#include "qv4string_p.h"
+#include "qv4global_p.h"
namespace QQmlJS {
diff --git a/src/qml/qml/v4vm/qv4isel_masm.cpp b/src/qml/qml/v4vm/qv4isel_masm.cpp
index a9d41ca32e..027e2c5e2f 100644
--- a/src/qml/qml/v4vm/qv4isel_masm.cpp
+++ b/src/qml/qml/v4vm/qv4isel_masm.cpp
@@ -40,12 +40,12 @@
****************************************************************************/
#include "qv4isel_masm_p.h"
-#include "qv4runtime.h"
-#include "qv4object.h"
-#include "qv4functionobject.h"
-#include "qv4regexpobject.h"
-#include "qv4unwindhelper.h"
-#include "qv4lookup.h"
+#include "qv4runtime_p.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
+#include "qv4regexpobject_p.h"
+#include "qv4unwindhelper_p.h"
+#include "qv4lookup_p.h"
#include <assembler/LinkBuffer.h>
#include <WTFStubs.h>
diff --git a/src/qml/qml/v4vm/qv4isel_masm_p.h b/src/qml/qml/v4vm/qv4isel_masm_p.h
index 9f8704725f..1dd2ca0a2a 100644
--- a/src/qml/qml/v4vm/qv4isel_masm_p.h
+++ b/src/qml/qml/v4vm/qv4isel_masm_p.h
@@ -41,12 +41,12 @@
#ifndef QV4ISEL_MASM_P_H
#define QV4ISEL_MASM_P_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
#include "qv4isel_util_p.h"
-#include "qv4object.h"
-#include "qv4runtime.h"
+#include "qv4object_p.h"
+#include "qv4runtime_p.h"
#include <QtCore/QHash>
#include <config.h>
diff --git a/src/qml/qml/v4vm/qv4isel_p.cpp b/src/qml/qml/v4vm/qv4isel_p.cpp
index 417e38550e..6c5d48dd3a 100644
--- a/src/qml/qml/v4vm/qv4isel_p.cpp
+++ b/src/qml/qml/v4vm/qv4isel_p.cpp
@@ -1,9 +1,9 @@
-#include "debugging.h"
-#include "qv4engine.h"
+#include "qv4debugging_p.h"
+#include "qv4engine_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
#include "qv4isel_util_p.h"
-#include "qv4functionobject.h"
+#include "qv4functionobject_p.h"
#include <QString>
diff --git a/src/qml/qml/v4vm/qv4isel_p.h b/src/qml/qml/v4vm/qv4isel_p.h
index e85127c5a9..b56cbe334c 100644
--- a/src/qml/qml/v4vm/qv4isel_p.h
+++ b/src/qml/qml/v4vm/qv4isel_p.h
@@ -42,7 +42,7 @@
#ifndef QV4ISEL_P_H
#define QV4ISEL_P_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include "qv4jsir_p.h"
#include <qglobal.h>
diff --git a/src/qml/qml/v4vm/qv4isel_util_p.h b/src/qml/qml/v4vm/qv4isel_util_p.h
index e10a9658f2..e016a19cac 100644
--- a/src/qml/qml/v4vm/qv4isel_util_p.h
+++ b/src/qml/qml/v4vm/qv4isel_util_p.h
@@ -42,7 +42,7 @@
#ifndef QV4ISEL_UTIL_P_H
#define QV4ISEL_UTIL_P_H
-#include "qv4runtime.h"
+#include "qv4runtime_p.h"
#include "qv4jsir_p.h"
namespace QQmlJS {
diff --git a/src/qml/qml/v4vm/qv4jsir_p.h b/src/qml/qml/v4vm/qv4jsir_p.h
index 47368449fc..1224e42dfa 100644
--- a/src/qml/qml/v4vm/qv4jsir_p.h
+++ b/src/qml/qml/v4vm/qv4jsir_p.h
@@ -52,7 +52,7 @@
// We mean it.
//
-#include "qv4global.h"
+#include "qv4global_p.h"
#include <private/qqmljsmemorypool_p.h>
#include <QtCore/QVector>
diff --git a/src/qml/qml/v4vm/qv4jsonobject.cpp b/src/qml/qml/v4vm/qv4jsonobject.cpp
index cb4df70970..1c9b65c296 100644
--- a/src/qml/qml/v4vm/qv4jsonobject.cpp
+++ b/src/qml/qml/v4vm/qv4jsonobject.cpp
@@ -38,12 +38,12 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <qv4jsonobject.h>
-#include <qv4objectproto.h>
-#include <qv4numberobject.h>
-#include <qv4stringobject.h>
-#include <qv4booleanobject.h>
-#include <qv4objectiterator.h>
+#include <qv4jsonobject_p.h>
+#include <qv4objectproto_p.h>
+#include <qv4numberobject_p.h>
+#include <qv4stringobject_p.h>
+#include <qv4booleanobject_p.h>
+#include <qv4objectiterator_p.h>
#include <qjsondocument.h>
#include <qstack.h>
#include <qstringlist.h>
diff --git a/src/qml/qml/v4vm/qv4jsonobject.h b/src/qml/qml/v4vm/qv4jsonobject_p.h
index dba4786c2b..f8aaee464f 100644
--- a/src/qml/qml/v4vm/qv4jsonobject.h
+++ b/src/qml/qml/v4vm/qv4jsonobject_p.h
@@ -41,7 +41,7 @@
#ifndef QV4JSONOBJECTS_H
#define QV4SJONOBJECTS_H
-#include <qv4object.h>
+#include "qv4object_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4lookup.cpp b/src/qml/qml/v4vm/qv4lookup.cpp
index 38a11a99de..b5d312ad6a 100644
--- a/src/qml/qml/v4vm/qv4lookup.cpp
+++ b/src/qml/qml/v4vm/qv4lookup.cpp
@@ -38,8 +38,8 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "qv4lookup.h"
-#include "qv4functionobject.h"
+#include "qv4lookup_p.h"
+#include "qv4functionobject_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4lookup.h b/src/qml/qml/v4vm/qv4lookup_p.h
index 38546cd65b..0b18ebff2e 100644
--- a/src/qml/qml/v4vm/qv4lookup.h
+++ b/src/qml/qml/v4vm/qv4lookup_p.h
@@ -41,12 +41,12 @@
#ifndef QV4LOOKUP_H
#define QV4LOOKUP_H
-#include "qv4global.h"
-#include "qv4runtime.h"
-#include "qv4engine.h"
-#include "qv4context.h"
-#include "qv4object.h"
-#include "qv4internalclass.h"
+#include "qv4global_p.h"
+#include "qv4runtime_p.h"
+#include "qv4engine_p.h"
+#include "qv4context_p.h"
+#include "qv4object_p.h"
+#include "qv4internalclass_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4managed.cpp b/src/qml/qml/v4vm/qv4managed.cpp
index ab87b9dd9f..2df21ca59b 100644
--- a/src/qml/qml/v4vm/qv4managed.cpp
+++ b/src/qml/qml/v4vm/qv4managed.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "qv4managed.h"
-#include "qv4mm.h"
-#include "qv4errorobject.h"
+#include "qv4managed_p.h"
+#include "qv4mm_p.h"
+#include "qv4errorobject_p.h"
using namespace QQmlJS::VM;
diff --git a/src/qml/qml/v4vm/qv4managed.h b/src/qml/qml/v4vm/qv4managed_p.h
index 844c88772b..b6f1e337a5 100644
--- a/src/qml/qml/v4vm/qv4managed.h
+++ b/src/qml/qml/v4vm/qv4managed_p.h
@@ -44,7 +44,7 @@
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QtCore/QDebug>
-#include "qv4global.h"
+#include "qv4global_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4math.h b/src/qml/qml/v4vm/qv4math_p.h
index 0699c0c971..0699c0c971 100644
--- a/src/qml/qml/v4vm/qv4math.h
+++ b/src/qml/qml/v4vm/qv4math_p.h
diff --git a/src/qml/qml/v4vm/qv4mathobject.cpp b/src/qml/qml/v4vm/qv4mathobject.cpp
index d1017ebad6..f3271f295b 100644
--- a/src/qml/qml/v4vm/qv4mathobject.cpp
+++ b/src/qml/qml/v4vm/qv4mathobject.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qv4mathobject.h"
-#include "qv4objectproto.h"
+#include "qv4mathobject_p.h"
+#include "qv4objectproto_p.h"
#include <cmath>
#include <qmath.h>
diff --git a/src/qml/qml/v4vm/qv4mathobject.h b/src/qml/qml/v4vm/qv4mathobject_p.h
index 68ca87d38b..768e0c8fa6 100644
--- a/src/qml/qml/v4vm/qv4mathobject.h
+++ b/src/qml/qml/v4vm/qv4mathobject_p.h
@@ -41,7 +41,7 @@
#ifndef QV4MATHOBJECT_H
#define QV$MATHOBJECT_H
-#include "qv4object.h"
+#include "qv4object_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4mm.cpp b/src/qml/qml/v4vm/qv4mm.cpp
index 19e0e3fd68..4cb4f6c60d 100644
--- a/src/qml/qml/v4vm/qv4mm.cpp
+++ b/src/qml/qml/v4vm/qv4mm.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qv4engine.h"
-#include "qv4object.h"
-#include "qv4objectproto.h"
-#include "qv4mm.h"
+#include "qv4engine_p.h"
+#include "qv4object_p.h"
+#include "qv4objectproto_p.h"
+#include "qv4mm_p.h"
#include "PageAllocation.h"
#include "StdLibExtras.h"
diff --git a/src/qml/qml/v4vm/qv4mm.h b/src/qml/qml/v4vm/qv4mm_p.h
index a41df835c3..0ab63bfa2d 100644
--- a/src/qml/qml/v4vm/qv4mm.h
+++ b/src/qml/qml/v4vm/qv4mm_p.h
@@ -42,8 +42,8 @@
#ifndef QV4GC_H
#define QV4GC_H
-#include "qv4global.h"
-#include "qv4context.h"
+#include "qv4global_p.h"
+#include "qv4context_p.h"
#include <QScopedPointer>
diff --git a/src/qml/qml/v4vm/qv4numberobject.cpp b/src/qml/qml/v4vm/qv4numberobject.cpp
index f32c8b4f97..ce03f40a89 100644
--- a/src/qml/qml/v4vm/qv4numberobject.cpp
+++ b/src/qml/qml/v4vm/qv4numberobject.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qv4numberobject.h"
+#include "qv4numberobject_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>
#include <QtCore/QDebug>
diff --git a/src/qml/qml/v4vm/qv4numberobject.h b/src/qml/qml/v4vm/qv4numberobject_p.h
index d8be4790da..7d89264052 100644
--- a/src/qml/qml/v4vm/qv4numberobject.h
+++ b/src/qml/qml/v4vm/qv4numberobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4NUMBEROBJECT_H
#define QV4NUMBEROBJECT_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4object.cpp b/src/qml/qml/v4vm/qv4object.cpp
index 5091ceb095..46c1aa63fd 100644
--- a/src/qml/qml/v4vm/qv4object.cpp
+++ b/src/qml/qml/v4vm/qv4object.cpp
@@ -39,13 +39,13 @@
**
****************************************************************************/
-#include "qv4object.h"
+#include "qv4object_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
-#include "qv4objectproto.h"
-#include "qv4stringobject.h"
-#include "qv4argumentsobject.h"
-#include "qv4mm.h"
+#include "qv4objectproto_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4argumentsobject_p.h"
+#include "qv4mm_p.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>
diff --git a/src/qml/qml/v4vm/qv4object.h b/src/qml/qml/v4vm/qv4object_p.h
index d1bac5f03f..4039eb6da7 100644
--- a/src/qml/qml/v4vm/qv4object.h
+++ b/src/qml/qml/v4vm/qv4object_p.h
@@ -41,18 +41,18 @@
#ifndef QMLJS_OBJECTS_H
#define QMLJS_OBJECTS_H
-#include "qv4global.h"
-#include "qv4runtime.h"
-#include "qv4engine.h"
-#include "qv4context.h"
-#include "qv4sparsearray.h"
-#include "qv4string.h"
+#include "qv4global_p.h"
+#include "qv4runtime_p.h"
+#include "qv4engine_p.h"
+#include "qv4context_p.h"
+#include "qv4sparsearray_p.h"
+#include "qv4string_p.h"
#include "qv4codegen_p.h"
#include "qv4isel_p.h"
-#include "qv4managed.h"
-#include "qv4property.h"
-#include "qv4internalclass.h"
-#include "qv4objectiterator.h"
+#include "qv4managed_p.h"
+#include "qv4property_p.h"
+#include "qv4internalclass_p.h"
+#include "qv4objectiterator_p.h"
#include <QtCore/QString>
#include <QtCore/QHash>
diff --git a/src/qml/qml/v4vm/qv4objectiterator.cpp b/src/qml/qml/v4vm/qv4objectiterator.cpp
index 44ba9efcaa..5c1dd62736 100644
--- a/src/qml/qml/v4vm/qv4objectiterator.cpp
+++ b/src/qml/qml/v4vm/qv4objectiterator.cpp
@@ -38,10 +38,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "qv4objectiterator.h"
-#include "qv4object.h"
-#include "qv4stringobject.h"
-#include "qv4identifier.h"
+#include "qv4objectiterator_p.h"
+#include "qv4object_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4identifier_p.h"
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4objectiterator.h b/src/qml/qml/v4vm/qv4objectiterator_p.h
index c740132661..8df6825a3c 100644
--- a/src/qml/qml/v4vm/qv4objectiterator.h
+++ b/src/qml/qml/v4vm/qv4objectiterator_p.h
@@ -41,9 +41,9 @@
#ifndef QV4OBJECTITERATOR_H
#define QV4OBJECTITERATOR_H
-#include "qv4value.h"
-#include <qv4internalclass.h>
-#include <qv4property.h>
+#include "qv4value_p.h"
+#include "qv4internalclass_p.h"
+#include "qv4property_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4objectproto.cpp b/src/qml/qml/v4vm/qv4objectproto.cpp
index df3d4c8e43..19baa719af 100644
--- a/src/qml/qml/v4vm/qv4objectproto.cpp
+++ b/src/qml/qml/v4vm/qv4objectproto.cpp
@@ -40,8 +40,8 @@
****************************************************************************/
-#include "qv4objectproto.h"
-#include "qv4mm.h"
+#include "qv4objectproto_p.h"
+#include "qv4mm_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>
#include <QtCore/QDateTime>
diff --git a/src/qml/qml/v4vm/qv4objectproto.h b/src/qml/qml/v4vm/qv4objectproto_p.h
index 0a19f45b06..4920b4377f 100644
--- a/src/qml/qml/v4vm/qv4objectproto.h
+++ b/src/qml/qml/v4vm/qv4objectproto_p.h
@@ -41,8 +41,8 @@
#ifndef QV4ECMAOBJECTS_P_H
#define QV4ECMAOBJECTS_P_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4property.h b/src/qml/qml/v4vm/qv4property_p.h
index afb5ede277..f9530d94a1 100644
--- a/src/qml/qml/v4vm/qv4property.h
+++ b/src/qml/qml/v4vm/qv4property_p.h
@@ -41,9 +41,9 @@
#ifndef QV4PROPERTYDESCRIPTOR_H
#define QV4PROPERTYDESCRIPTOR_H
-#include "qv4global.h"
-#include "qv4value.h"
-#include "qv4internalclass.h"
+#include "qv4global_p.h"
+#include "qv4value_p.h"
+#include "qv4internalclass_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4regexp.cpp b/src/qml/qml/v4vm/qv4regexp.cpp
index c0f7cee51d..7ee1d6bb95 100644
--- a/src/qml/qml/v4vm/qv4regexp.cpp
+++ b/src/qml/qml/v4vm/qv4regexp.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "qv4regexp.h"
+#include "qv4regexp_p.h"
-#include "qv4engine.h"
+#include "qv4engine_p.h"
namespace QQmlJS {
namespace VM {
diff --git a/src/qml/qml/v4vm/qv4regexp.h b/src/qml/qml/v4vm/qv4regexp_p.h
index b0c95843f3..e8b01953bc 100644
--- a/src/qml/qml/v4vm/qv4regexp.h
+++ b/src/qml/qml/v4vm/qv4regexp_p.h
@@ -53,8 +53,8 @@
#include <yarr/Yarr.h>
#include <yarr/YarrInterpreter.h>
-#include "qv4managed.h"
-#include "qv4engine.h"
+#include "qv4managed_p.h"
+#include "qv4engine_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4regexpobject.cpp b/src/qml/qml/v4vm/qv4regexpobject.cpp
index 3119382e69..4dabb76c1f 100644
--- a/src/qml/qml/v4vm/qv4regexpobject.cpp
+++ b/src/qml/qml/v4vm/qv4regexpobject.cpp
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#include "qv4regexpobject.h"
+#include "qv4regexpobject_p.h"
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
-#include "qv4objectproto.h"
-#include "qv4stringobject.h"
-#include "qv4mm.h"
+#include "qv4objectproto_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4mm_p.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>
diff --git a/src/qml/qml/v4vm/qv4regexpobject.h b/src/qml/qml/v4vm/qv4regexpobject_p.h
index df4190ba77..af30027295 100644
--- a/src/qml/qml/v4vm/qv4regexpobject.h
+++ b/src/qml/qml/v4vm/qv4regexpobject_p.h
@@ -41,17 +41,17 @@
#ifndef QV4REGEXPOBJECT_H
#define QV4REGEXPOBJECT_H
-#include "qv4runtime.h"
-#include "qv4engine.h"
-#include "qv4context.h"
-#include "qv4functionobject.h"
-#include "qv4string.h"
+#include "qv4runtime_p.h"
+#include "qv4engine_p.h"
+#include "qv4context_p.h"
+#include "qv4functionobject_p.h"
+#include "qv4string_p.h"
#include "qv4codegen_p.h"
#include "qv4isel_p.h"
-#include "qv4managed.h"
-#include "qv4property.h"
-#include "qv4objectiterator.h"
-#include "qv4regexp.h"
+#include "qv4managed_p.h"
+#include "qv4property_p.h"
+#include "qv4objectiterator_p.h"
+#include "qv4regexp_p.h"
#include <QtCore/QString>
#include <QtCore/QHash>
diff --git a/src/qml/qml/v4vm/qv4runtime.cpp b/src/qml/qml/v4vm/qv4runtime.cpp
index 9cd92677f6..8290bba3f2 100644
--- a/src/qml/qml/v4vm/qv4runtime.cpp
+++ b/src/qml/qml/v4vm/qv4runtime.cpp
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#include "qv4global.h"
-#include "debugging.h"
-#include "qv4runtime.h"
-#include "qv4object.h"
+#include "qv4global_p.h"
+#include "qv4debugging_p.h"
+#include "qv4runtime_p.h"
+#include "qv4object_p.h"
#include "qv4jsir_p.h"
-#include "qv4objectproto.h"
-#include "qv4globalobject.h"
-#include "qv4stringobject.h"
-#include "qv4lookup.h"
+#include "qv4objectproto_p.h"
+#include "qv4globalobject_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4lookup_p.h"
#include "private/qlocale_tools_p.h"
#include <QtCore/qmath.h>
diff --git a/src/qml/qml/v4vm/qv4runtime.h b/src/qml/qml/v4vm/qv4runtime_p.h
index 6e64c44e69..b52009859d 100644
--- a/src/qml/qml/v4vm/qv4runtime.h
+++ b/src/qml/qml/v4vm/qv4runtime_p.h
@@ -41,9 +41,9 @@
#ifndef QMLJS_RUNTIME_H
#define QMLJS_RUNTIME_H
-#include "qv4global.h"
-#include "qv4value.h"
-#include "qv4math.h"
+#include "qv4global_p.h"
+#include "qv4value_p.h"
+#include "qv4math_p.h"
#include <QtCore/QString>
diff --git a/src/qml/qml/v4vm/qv4sparsearray.cpp b/src/qml/qml/v4vm/qv4sparsearray.cpp
index 2c9075ba5b..20a2ff966e 100644
--- a/src/qml/qml/v4vm/qv4sparsearray.cpp
+++ b/src/qml/qml/v4vm/qv4sparsearray.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qv4sparsearray.h"
-#include "qv4runtime.h"
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4sparsearray_p.h"
+#include "qv4runtime_p.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <stdlib.h>
#ifdef QT_QMAP_DEBUG
diff --git a/src/qml/qml/v4vm/qv4sparsearray.h b/src/qml/qml/v4vm/qv4sparsearray_p.h
index a6f7d40c38..ee487812c3 100644
--- a/src/qml/qml/v4vm/qv4sparsearray.h
+++ b/src/qml/qml/v4vm/qv4sparsearray_p.h
@@ -42,10 +42,10 @@
#ifndef QV4ARRAY_H
#define QV4ARRAY_H
-#include "qv4global.h"
+#include "qv4global_p.h"
#include <QtCore/qmap.h>
-#include <qv4value.h>
-#include <qv4property.h>
+#include "qv4value_p.h"
+#include "qv4property_p.h"
#include <assert.h>
#ifdef Q_MAP_DEBUG
diff --git a/src/qml/qml/v4vm/qv4string.cpp b/src/qml/qml/v4vm/qv4string.cpp
index cb17547f07..24d75e561a 100644
--- a/src/qml/qml/v4vm/qv4string.cpp
+++ b/src/qml/qml/v4vm/qv4string.cpp
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#include "qv4string.h"
-#include "qv4identifier.h"
-#include "qv4runtime.h"
-#include "qv4objectproto.h"
-#include "qv4stringobject.h"
+#include "qv4string_p.h"
+#include "qv4identifier_p.h"
+#include "qv4runtime_p.h"
+#include "qv4objectproto_p.h"
+#include "qv4stringobject_p.h"
#include <QtCore/QHash>
namespace QQmlJS {
diff --git a/src/qml/qml/v4vm/qv4string.h b/src/qml/qml/v4vm/qv4string_p.h
index f4eeb7d0a8..7f49588fbe 100644
--- a/src/qml/qml/v4vm/qv4string.h
+++ b/src/qml/qml/v4vm/qv4string_p.h
@@ -42,7 +42,7 @@
#define QV4STRING_H
#include <QtCore/qstring.h>
-#include "qv4managed.h"
+#include "qv4managed_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4stringobject.cpp b/src/qml/qml/v4vm/qv4stringobject.cpp
index 42b9b422ec..c52dbf13fd 100644
--- a/src/qml/qml/v4vm/qv4stringobject.cpp
+++ b/src/qml/qml/v4vm/qv4stringobject.cpp
@@ -40,10 +40,10 @@
****************************************************************************/
-#include "qv4stringobject.h"
-#include "qv4regexpobject.h"
-#include "qv4objectproto.h"
-#include "qv4mm.h"
+#include "qv4stringobject_p.h"
+#include "qv4regexpobject_p.h"
+#include "qv4objectproto_p.h"
+#include "qv4mm_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>
#include <QtCore/QDateTime>
diff --git a/src/qml/qml/v4vm/qv4stringobject.h b/src/qml/qml/v4vm/qv4stringobject_p.h
index ded26c501b..d22a6433ab 100644
--- a/src/qml/qml/v4vm/qv4stringobject.h
+++ b/src/qml/qml/v4vm/qv4stringobject_p.h
@@ -41,8 +41,8 @@
#ifndef QV4STRINGOBJECT_P_H
#define QV4STRINGOBJECT_P_H
-#include "qv4object.h"
-#include "qv4functionobject.h"
+#include "qv4object_p.h"
+#include "qv4functionobject_p.h"
#include <QtCore/qnumeric.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4unwindhelper.cpp b/src/qml/qml/v4vm/qv4unwindhelper.cpp
index 8a50b0bb53..ba7690cf4e 100644
--- a/src/qml/qml/v4vm/qv4unwindhelper.cpp
+++ b/src/qml/qml/v4vm/qv4unwindhelper.cpp
@@ -1,4 +1,4 @@
-#include <qv4unwindhelper.h>
+#include <qv4unwindhelper_p.h>
#include <wtf/Platform.h>
diff --git a/src/qml/qml/v4vm/qv4unwindhelper_p-arm.h b/src/qml/qml/v4vm/qv4unwindhelper_p-arm.h
index 6938fa5189..ee30deebea 100644
--- a/src/qml/qml/v4vm/qv4unwindhelper_p-arm.h
+++ b/src/qml/qml/v4vm/qv4unwindhelper_p-arm.h
@@ -1,8 +1,8 @@
#ifndef QV4UNWINDHELPER_PDW2_H
#define QV4UNWINDHELPER_PDW2_H
-#include <qv4unwindhelper.h>
-#include <qv4functionobject.h>
+#include "qv4unwindhelper_p.h"
+#include "qv4functionobject_p.h"
#include <wtf/Platform.h>
#include <QMap>
diff --git a/src/qml/qml/v4vm/qv4unwindhelper_p-dw2.h b/src/qml/qml/v4vm/qv4unwindhelper_p-dw2.h
index 10c99f539c..274fca4a23 100644
--- a/src/qml/qml/v4vm/qv4unwindhelper_p-dw2.h
+++ b/src/qml/qml/v4vm/qv4unwindhelper_p-dw2.h
@@ -1,8 +1,8 @@
#ifndef QV4UNWINDHELPER_PDW2_H
#define QV4UNWINDHELPER_PDW2_H
-#include <qv4unwindhelper.h>
-#include <qv4functionobject.h>
+#include "qv4unwindhelper_p.h"
+#include "qv4functionobject_p.h"
#include <wtf/Platform.h>
#include <QMap>
diff --git a/src/qml/qml/v4vm/qv4unwindhelper.h b/src/qml/qml/v4vm/qv4unwindhelper_p.h
index 9f6462d644..9f6462d644 100644
--- a/src/qml/qml/v4vm/qv4unwindhelper.h
+++ b/src/qml/qml/v4vm/qv4unwindhelper_p.h
diff --git a/src/qml/qml/v4vm/qv4util.h b/src/qml/qml/v4vm/qv4util_p.h
index c43d85eca7..5857c22199 100644
--- a/src/qml/qml/v4vm/qv4util.h
+++ b/src/qml/qml/v4vm/qv4util_p.h
@@ -41,7 +41,7 @@
#ifndef QV4UTIL_H
#define QV4UTIL_H
-#include "qv4global.h"
+#include "qv4global_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/v4vm/qv4v8.cpp b/src/qml/qml/v4vm/qv4v8.cpp
index d81f23f30f..6c1abe0384 100644
--- a/src/qml/qml/v4vm/qv4v8.cpp
+++ b/src/qml/qml/v4vm/qv4v8.cpp
@@ -39,22 +39,22 @@
**
****************************************************************************/
-#include "qv4v8.h"
-
-#include "qv4engine.h"
-#include "qv4runtime.h"
-#include "qv4mm.h"
-#include "qv4managed.h"
-#include "qv4functionobject.h"
-#include "qv4value.h"
+#include "qv4v8_p.h"
+
+#include "qv4engine_p.h"
+#include "qv4runtime_p.h"
+#include "qv4mm_p.h"
+#include "qv4managed_p.h"
+#include "qv4functionobject_p.h"
+#include "qv4value_p.h"
#include "qv4isel_masm_p.h"
-#include "qv4globalobject.h"
-#include "qv4regexpobject.h"
-#include "qv4dateobject.h"
-#include "qv4numberobject.h"
-#include "qv4booleanobject.h"
-#include "qv4stringobject.h"
-#include "qv4objectproto.h"
+#include "qv4globalobject_p.h"
+#include "qv4regexpobject_p.h"
+#include "qv4dateobject_p.h"
+#include "qv4numberobject_p.h"
+#include "qv4booleanobject_p.h"
+#include "qv4stringobject_p.h"
+#include "qv4objectproto_p.h"
#include <QThreadStorage>
using namespace QQmlJS;
diff --git a/src/qml/qml/v4vm/qv4v8.h b/src/qml/qml/v4vm/qv4v8_p.h
index bcd6a7fef3..35fcf5b3e5 100644
--- a/src/qml/qml/v4vm/qv4v8.h
+++ b/src/qml/qml/v4vm/qv4v8_p.h
@@ -78,8 +78,8 @@
#ifndef V8_H_
#define V8_H_
-#include "qv4global.h"
-#include "qv4string.h"
+#include "qv4global_p.h"
+#include "qv4string_p.h"
#include <QStack>
#include <QSharedData>
diff --git a/src/qml/qml/v4vm/qv4value.cpp b/src/qml/qml/v4vm/qv4value.cpp
index 73efe7d22d..36a2b1105e 100644
--- a/src/qml/qml/v4vm/qv4value.cpp
+++ b/src/qml/qml/v4vm/qv4value.cpp
@@ -38,10 +38,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <qv4engine.h>
-#include <qv4object.h>
-#include <qv4objectproto.h>
-#include "qv4mm.h"
+#include <qv4engine_p.h>
+#include <qv4object_p.h>
+#include <qv4objectproto_p.h>
+#include "qv4mm_p.h"
#include <wtf/MathExtras.h>
diff --git a/src/qml/qml/v4vm/qv4value.h b/src/qml/qml/v4vm/qv4value_p.h
index bbfba842b5..4bdea1fe47 100644
--- a/src/qml/qml/v4vm/qv4value.h
+++ b/src/qml/qml/v4vm/qv4value_p.h
@@ -43,10 +43,10 @@
#include <QtCore/QString>
#include <QtCore/qnumeric.h>
-#include "qv4global.h"
-#include "qv4string.h"
+#include "qv4global_p.h"
+#include "qv4string_p.h"
#include <QtCore/QDebug>
-#include "qv4managed.h"
+#include "qv4managed_p.h"
#include <wtf/MathExtras.h>
diff --git a/src/qml/qml/v4vm/v4.pri b/src/qml/qml/v4vm/v4.pri
deleted file mode 100644
index 3b9711bdb6..0000000000
--- a/src/qml/qml/v4vm/v4.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-include(llvm_installation.pri)
-include(../3rdparty/masm/masm-defs.pri)
-
-CONFIG += exceptions
-
-!llvm: DEFINES += QMLJS_NO_LLVM
-
-INCLUDEPATH += $$PWD
diff --git a/src/qml/qml/v4vm/v4.pro b/src/qml/qml/v4vm/v4.pro
deleted file mode 100644
index 325a1013b1..0000000000
--- a/src/qml/qml/v4vm/v4.pro
+++ /dev/null
@@ -1,177 +0,0 @@
-TARGET = QtV4
-QT_PRIVATE = core-private qmldevtools-private
-QT = core
-
-CONFIG += internal_module
-
-include(v4.pri)
-
-load(qt_build_config)
-load(qt_module)
-
-CONFIG += warn_off
-
-#win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 #TODO ??!
-
-!macx-clang*:!win*:LIBS += -rdynamic
-
-SOURCES += \
- qv4codegen.cpp \
- qv4jsir.cpp \
- qv4engine.cpp \
- qv4context.cpp \
- qv4runtime.cpp \
- qv4value.cpp \
- qv4syntaxchecker.cpp \
- qv4isel_masm.cpp \
- llvm_runtime.cpp \
- qv4isel_p.cpp \
- debugging.cpp \
- qv4lookup.cpp \
- qv4mm.cpp \
- qv4managed.cpp \
- qv4internalclass.cpp \
- qv4sparsearray.cpp \
- qv4arrayobject.cpp \
- qv4argumentsobject.cpp \
- qv4booleanobject.cpp \
- qv4dateobject.cpp \
- qv4errorobject.cpp \
- qv4functionobject.cpp \
- qv4globalobject.cpp \
- qv4jsonobject.cpp \
- qv4mathobject.cpp \
- qv4numberobject.cpp \
- qv4object.cpp \
- qv4objectproto.cpp \
- qv4regexpobject.cpp \
- qv4stringobject.cpp \
- qv4string.cpp \
- qv4objectiterator.cpp \
- qv4regexp.cpp \
- qv4unwindhelper.cpp \
- qv4v8.cpp \
- qv4executableallocator.cpp
-
-HEADERS += \
- qv4global.h \
- qv4codegen_p.h \
- qv4jsir_p.h \
- qv4engine.h \
- qv4context.h \
- qv4runtime.h \
- qv4math.h \
- qv4value.h \
- qv4syntaxchecker_p.h \
- qv4isel_masm_p.h \
- qv4isel_p.h \
- qv4isel_util_p.h \
- debugging.h \
- qv4lookup.h \
- qv4identifier.h \
- qv4mm.h \
- qv4managed.h \
- qv4internalclass.h \
- qv4sparsearray.h \
- qv4arrayobject.h \
- qv4argumentsobject.h \
- qv4booleanobject.h \
- qv4dateobject.h \
- qv4errorobject.h \
- qv4functionobject.h \
- qv4globalobject.h \
- qv4jsonobject.h \
- qv4mathobject.h \
- qv4numberobject.h \
- qv4object.h \
- qv4objectproto.h \
- qv4regexpobject.h \
- qv4stringobject.h \
- qv4string.h \
- qv4property.h \
- qv4objectiterator.h \
- qv4regexp.h \
- qv4unwindhelper.h \
- qv4unwindhelper_p-dw2.h \
- qv4unwindhelper_p-arm.h \
- qv4v8.h \
- qcalculatehash_p.h \
- qv4util.h \
- qv4executableallocator.h
-
-llvm-libs {
-
-SOURCES += \
- qv4isel_llvm.cpp
-
-HEADERS += \
- qv4isel_llvm_p.h \
- qv4_llvm_p.h
-
-LLVM_RUNTIME_BC = $$PWD/llvm_runtime.bc
-DEFINES += LLVM_RUNTIME="\"\\\"$$LLVM_RUNTIME_BC\\\"\""
-DEFINES += QMLJS_WITH_LLVM
-
-INCLUDEPATH += \
- $$system($$LLVM_CONFIG --includedir)
-
-QMAKE_CXXFLAGS += $$system($$LLVM_CONFIG --cppflags) -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS -= -pedantic
-QMAKE_CXXFLAGS -= -Wcovered-switch-default
-
-LIBS += \
- $$system($$LLVM_CONFIG --ldflags) \
- $$system($$LLVM_CONFIG --libs core jit bitreader linker ipo target x86 arm native)
-
-QMAKE_EXTRA_TARGETS += gen_llvm_runtime
-
-GEN_LLVM_RUNTIME_FLAGS = $$system($$LLVM_CONFIG --cppflags)
-GEN_LLVM_RUNTIME_FLAGS -= -pedantic
-
-gen_llvm_runtime.target = llvm_runtime
-gen_llvm_runtime.commands = clang -O2 -emit-llvm -c -I$$PWD -I$$PWD/../3rdparty/masm $$join(QT.core.includes, " -I", "-I") $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o $$LLVM_RUNTIME_BC
-}
-
-# Use SSE2 floating point math on 32 bit instead of the default
-# 387 to make test results pass on 32 and on 64 bit builds.
-linux-g++*:isEqual(QT_ARCH,i386) {
- QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse
- QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
-}
-
-TESTSCRIPT=$$PWD/../../tests/test262.py
-V4CMD = v4
-
-checktarget.target = check
-checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
-checktarget.depends = all
-QMAKE_EXTRA_TARGETS += checktarget
-
-checkmothtarget.target = check-interpreter
-checkmothtarget.commands = python $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations
-checkmothtarget.depends = all
-QMAKE_EXTRA_TARGETS += checkmothtarget
-
-linux*|mac {
- LIBS += -ldl
-}
-
-debug-with-libunwind {
- UW_INC=$$(LIBUNWIND_INCLUDES)
- isEmpty(UW_INC): error("Please set LIBUNWIND_INCLUDES")
- INCLUDEPATH += $$UW_INC
- UW_LIBS=$$(LIBUNWIND_LIBS)
- isEmpty(UW_LIBS): error("Please set LIBUNWIND_LIBS")
- LIBS += -L$$UW_LIBS
- equals(QT_ARCH, arm): LIBS += -lunwind-arm
- LIBS += -lunwind-dwarf-common -lunwind-dwarf-local -lunwind-elf32 -lunwind
- DEFINES += WTF_USE_LIBUNWIND_DEBUG=1
-}
-
-valgrind {
- DEFINES += V4_USE_VALGRIND
-}
-
-include(moth/moth.pri)
-include(../3rdparty/masm/masm.pri)
-include(../3rdparty/double-conversion/double-conversion.pri)
diff --git a/src/qml/qml/v4vm/v4vm.pri b/src/qml/qml/v4vm/v4vm.pri
new file mode 100644
index 0000000000..7a600b7a3d
--- /dev/null
+++ b/src/qml/qml/v4vm/v4vm.pri
@@ -0,0 +1,158 @@
+include(llvm_installation.pri)
+include(../../../3rdparty/masm/masm-defs.pri)
+
+CONFIG += exceptions
+
+!llvm: DEFINES += QMLJS_NO_LLVM
+
+CONFIG += warn_off
+
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+ $$PWD/qv4codegen.cpp \
+ $$PWD/qv4jsir.cpp \
+ $$PWD/qv4engine.cpp \
+ $$PWD/qv4context.cpp \
+ $$PWD/qv4runtime.cpp \
+ $$PWD/qv4value.cpp \
+ $$PWD/qv4syntaxchecker.cpp \
+ $$PWD/qv4isel_masm.cpp \
+ $$PWD/llvm_runtime.cpp \
+ $$PWD/qv4isel_p.cpp \
+ $$PWD/qv4debugging.cpp \
+ $$PWD/qv4lookup.cpp \
+ $$PWD/qv4mm.cpp \
+ $$PWD/qv4managed.cpp \
+ $$PWD/qv4internalclass.cpp \
+ $$PWD/qv4sparsearray.cpp \
+ $$PWD/qv4arrayobject.cpp \
+ $$PWD/qv4argumentsobject.cpp \
+ $$PWD/qv4booleanobject.cpp \
+ $$PWD/qv4dateobject.cpp \
+ $$PWD/qv4errorobject.cpp \
+ $$PWD/qv4functionobject.cpp \
+ $$PWD/qv4globalobject.cpp \
+ $$PWD/qv4jsonobject.cpp \
+ $$PWD/qv4mathobject.cpp \
+ $$PWD/qv4numberobject.cpp \
+ $$PWD/qv4object.cpp \
+ $$PWD/qv4objectproto.cpp \
+ $$PWD/qv4regexpobject.cpp \
+ $$PWD/qv4stringobject.cpp \
+ $$PWD/qv4string.cpp \
+ $$PWD/qv4objectiterator.cpp \
+ $$PWD/qv4regexp.cpp \
+ $$PWD/qv4unwindhelper.cpp \
+ $$PWD/qv4v8.cpp \
+ $$PWD/qv4executableallocator.cpp
+
+HEADERS += \
+ $$PWD/qv4global_p.h \
+ $$PWD/qv4codegen_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/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 \
+ $$PWD/qv4mm_p.h \
+ $$PWD/qv4managed_p.h \
+ $$PWD/qv4internalclass_p.h \
+ $$PWD/qv4sparsearray_p.h \
+ $$PWD/qv4arrayobject_p.h \
+ $$PWD/qv4argumentsobject_p.h \
+ $$PWD/qv4booleanobject_p.h \
+ $$PWD/qv4dateobject_p.h \
+ $$PWD/qv4errorobject_p.h \
+ $$PWD/qv4functionobject_p.h \
+ $$PWD/qv4globalobject_p.h \
+ $$PWD/qv4jsonobject_p.h \
+ $$PWD/qv4mathobject_p.h \
+ $$PWD/qv4numberobject_p.h \
+ $$PWD/qv4object_p.h \
+ $$PWD/qv4objectproto_p.h \
+ $$PWD/qv4regexpobject_p.h \
+ $$PWD/qv4stringobject_p.h \
+ $$PWD/qv4string_p.h \
+ $$PWD/qv4property_p.h \
+ $$PWD/qv4objectiterator_p.h \
+ $$PWD/qv4regexp_p.h \
+ $$PWD/qv4unwindhelper_p.h \
+ $$PWD/qv4unwindhelper_p-dw2.h \
+ $$PWD/qv4unwindhelper_p-arm.h \
+ $$PWD/qv4v8_p.h \
+ $$PWD/qcalculatehash_p.h \
+ $$PWD/qv4util_p.h \
+ $$PWD/qv4executableallocator_p.h
+
+llvm-libs {
+
+SOURCES += \
+ $$PWD/qv4isel_llvm.cpp
+
+HEADERS += \
+ $$PWD/qv4isel_llvm_p.h \
+ $$PWD/qv4_llvm_p.h
+
+LLVM_RUNTIME_BC = $$PWD/llvm_runtime.bc
+DEFINES += LLVM_RUNTIME="\"\\\"$$LLVM_RUNTIME_BC\\\"\""
+DEFINES += QMLJS_WITH_LLVM
+
+INCLUDEPATH += \
+ $$system($$LLVM_CONFIG --includedir)
+
+QMAKE_CXXFLAGS += $$system($$LLVM_CONFIG --cppflags) -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS -= -pedantic
+QMAKE_CXXFLAGS -= -Wcovered-switch-default
+
+LIBS += \
+ $$system($$LLVM_CONFIG --ldflags) \
+ $$system($$LLVM_CONFIG --libs core jit bitreader linker ipo target x86 arm native)
+
+QMAKE_EXTRA_TARGETS += gen_llvm_runtime
+
+GEN_LLVM_RUNTIME_FLAGS = $$system($$LLVM_CONFIG --cppflags)
+GEN_LLVM_RUNTIME_FLAGS -= -pedantic
+
+gen_llvm_runtime.target = llvm_runtime
+gen_llvm_runtime.commands = clang -O2 -emit-llvm -c -I$$PWD -I$$PWD/../3rdparty/masm $$join(QT.core.includes, " -I", "-I") $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o $$LLVM_RUNTIME_BC
+}
+
+# Use SSE2 floating point math on 32 bit instead of the default
+# 387 to make test results pass on 32 and on 64 bit builds.
+linux-g++*:isEqual(QT_ARCH,i386) {
+ QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+ QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+}
+
+linux*|mac {
+ LIBS += -ldl
+}
+
+debug-with-libunwind {
+ UW_INC=$$(LIBUNWIND_INCLUDES)
+ isEmpty(UW_INC): error("Please set LIBUNWIND_INCLUDES")
+ INCLUDEPATH += $$UW_INC
+ UW_LIBS=$$(LIBUNWIND_LIBS)
+ isEmpty(UW_LIBS): error("Please set LIBUNWIND_LIBS")
+ LIBS += -L$$UW_LIBS
+ equals(QT_ARCH, arm): LIBS += -lunwind-arm
+ LIBS += -lunwind-dwarf-common -lunwind-dwarf-local -lunwind-elf32 -lunwind
+ DEFINES += WTF_USE_LIBUNWIND_DEBUG=1
+}
+
+valgrind {
+ DEFINES += V4_USE_VALGRIND
+}
+
+include(moth/moth.pri)
+include(../../../3rdparty/masm/masm.pri)
+include(../../../3rdparty/double-conversion/double-conversion.pri)
diff --git a/src/qml/qml/v8/qv8_p.h b/src/qml/qml/v8/qv8_p.h
index dc5ecc31bc..d18603c9de 100644
--- a/src/qml/qml/v8/qv8_p.h
+++ b/src/qml/qml/v8/qv8_p.h
@@ -39,4 +39,4 @@
**
****************************************************************************/
-#include <private/v8.h>
+#include <private/qv4v8_p.h>
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index 9ed792748c..952ef24922 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -2,7 +2,7 @@ TARGET = QtQuickTest
DEFINES += QT_NO_URL_CAST_FROM_STRING
QT = core
-QT_PRIVATE = testlib-private quick qml-private v8-private gui core-private
+QT_PRIVATE = testlib-private quick qml-private gui core-private
!contains(QT_CONFIG, no-widgets) {
QT += widgets
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index eedc71de92..b584734a83 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -1,7 +1,7 @@
TARGET = QtQuick
QT = core-private gui-private qml-private
-QT_PRIVATE = v8-private network
+QT_PRIVATE = network
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
diff --git a/sync.profile b/sync.profile
index 61d25bafa5..6ddda684da 100644
--- a/sync.profile
+++ b/sync.profile
@@ -19,5 +19,4 @@
%dependencies = (
"qtbase" => "refs/heads/dev",
"qtxmlpatterns" => "refs/heads/dev",
- "qtjsbackend" => "refs/heads/dev",
);
diff --git a/tests/auto/particles/qquickage/qquickage.pro b/tests/auto/particles/qquickage/qquickage.pro
index 1986e00818..3fffb28f31 100644
--- a/tests/auto/particles/qquickage/qquickage.pro
+++ b/tests/auto/particles/qquickage/qquickage.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro
index c1b853d323..4533f94388 100644
--- a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro
+++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro
index 27d1f564fa..ba4a6ba9d9 100644
--- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro
+++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro
index d6bc56d5a4..9442a29fb9 100644
--- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro
+++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro
index 441cf7712f..48e7303f86 100644
--- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro
+++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro
@@ -7,6 +7,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro
index 3e7d9444cb..324b980e78 100644
--- a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro
+++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickfriction/qquickfriction.pro b/tests/auto/particles/qquickfriction/qquickfriction.pro
index f4ffa09b22..b90b31ece2 100644
--- a/tests/auto/particles/qquickfriction/qquickfriction.pro
+++ b/tests/auto/particles/qquickfriction/qquickfriction.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickgravity/qquickgravity.pro b/tests/auto/particles/qquickgravity/qquickgravity.pro
index 574f914d3c..07c9eba314 100644
--- a/tests/auto/particles/qquickgravity/qquickgravity.pro
+++ b/tests/auto/particles/qquickgravity/qquickgravity.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
index c23b366d34..31b6fa5457 100644
--- a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
+++ b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private
+QT += core-private gui-private qml-private testlib quick-private quickparticles-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
index e07ac09fa0..271b2ec57c 100644
--- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
+++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
@@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
index 7a0f8aa71e..7db55d29e9 100644
--- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
+++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
@@ -7,6 +7,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro
index eea00ecf06..85e98f3cd4 100644
--- a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro
+++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro
index c9b217a7ab..d83006e523 100644
--- a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro
+++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro
index a1f30a079e..3d98e5f3bd 100644
--- a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro
+++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro
index d4cf1b4e5d..d3aeaecdca 100644
--- a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro
+++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro
index c8a460c335..60b1c1fc7f 100644
--- a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro
+++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro
index ecb171afac..e61527a11d 100644
--- a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro
+++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro
index 54169bcdc9..a8b2c1ca95 100644
--- a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro
+++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
index 3e53fae2e6..eb127c5fc2 100644
--- a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
+++ b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private
+QT += core-private gui-private qml-private testlib quick-private quickparticles-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
index 09511daca1..9fe6747378 100644
--- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
+++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro
index 28675e2695..1cb792eff2 100644
--- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro
+++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickturbulence/qquickturbulence.pro b/tests/auto/particles/qquickturbulence/qquickturbulence.pro
index 08961f1dc2..2db3d54e4c 100644
--- a/tests/auto/particles/qquickturbulence/qquickturbulence.pro
+++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/particles/qquickwander/qquickwander.pro b/tests/auto/particles/qquickwander/qquickwander.pro
index 6678b49435..41171645a2 100644
--- a/tests/auto/particles/qquickwander/qquickwander.pro
+++ b/tests/auto/particles/qquickwander/qquickwander.pro
@@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
+QT += core-private gui-private qml-private quick-private quickparticles-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
index 305f8f2509..5dadef62e4 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
@@ -12,5 +12,5 @@ include(../shared/debugutil.pri)
DEFINES += QT_QML_DEBUG_NO_WARNING
-QT += core-private qml-private quick-private v8-private testlib gui-private
+QT += core-private qml-private quick-private testlib gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
index 85b6a07c90..a62eb75c21 100644
--- a/tests/auto/qml/qjsengine/qjsengine.pro
+++ b/tests/auto/qml/qjsengine/qjsengine.pro
@@ -1,7 +1,7 @@
CONFIG += testcase
CONFIG += parallel_test
TARGET = tst_qjsengine
-QT += v8-private qml widgets testlib gui-private
+QT += qml qml-private widgets testlib gui-private
macx:CONFIG -= app_bundle
SOURCES += tst_qjsengine.cpp
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 70b718c4d8..0a238846b2 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -49,7 +49,7 @@
#include <QtCore/qnumeric.h>
#include <stdlib.h>
-#include <private/v8.h>
+#include <private/qv4v8_p.h>
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QObjectList)
diff --git a/tests/auto/qml/qqmlconnections/qqmlconnections.pro b/tests/auto/qml/qqmlconnections/qqmlconnections.pro
index 52f85f6219..7004ee0385 100644
--- a/tests/auto/qml/qqmlconnections/qqmlconnections.pro
+++ b/tests/auto/qml/qqmlconnections/qqmlconnections.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlcontext/qqmlcontext.pro b/tests/auto/qml/qqmlcontext/qqmlcontext.pro
index 48c0b5767c..2fb299cb10 100644
--- a/tests/auto/qml/qqmlcontext/qqmlcontext.pro
+++ b/tests/auto/qml/qqmlcontext/qqmlcontext.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private qml-private testlib v8-private
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro b/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro
index a3951da821..75436dd8e2 100644
--- a/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro
+++ b/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro
@@ -6,5 +6,5 @@ SOURCES += tst_qqmlcpputils.cpp
CONFIG += parallel_test
-QT += core-private gui-private qml-private testlib v8-private
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmldirparser/qqmldirparser.pro b/tests/auto/qml/qqmldirparser/qqmldirparser.pro
index 2abb4bd448..268198d050 100644
--- a/tests/auto/qml/qqmldirparser/qqmldirparser.pro
+++ b/tests/auto/qml/qqmldirparser/qqmldirparser.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qqmldirparser
-QT += qml testlib v8-private
+QT += qml testlib
macx:CONFIG -= app_bundle
SOURCES += tst_qqmldirparser.cpp
diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
index bc55ed9376..6193ee7c88 100644
--- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
+++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
@@ -16,7 +16,7 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private network testlib
+QT += core-private gui-private qml-private network testlib
qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro
index 8c6610158b..fd8c463742 100644
--- a/tests/auto/qml/qqmlengine/qqmlengine.pro
+++ b/tests/auto/qml/qqmlengine/qqmlengine.pro
@@ -6,5 +6,5 @@ include (../../shared/util.pri)
SOURCES += tst_qqmlengine.cpp
-QT += core-private gui-private qml-private v8-private network testlib
+QT += core-private gui-private qml-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlglobal/qqmlglobal.pro b/tests/auto/qml/qqmlglobal/qqmlglobal.pro
index 2715b44fad..d0d9fc400e 100644
--- a/tests/auto/qml/qqmlglobal/qqmlglobal.pro
+++ b/tests/auto/qml/qqmlglobal/qqmlglobal.pro
@@ -4,5 +4,5 @@ SOURCES += tst_qqmlglobal.cpp
macx:CONFIG -= app_bundle
CONFIG += parallel_test
-QT += qml-private testlib v8-private core-private gui-private
+QT += qml-private testlib core-private gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlincubator/qqmlincubator.pro b/tests/auto/qml/qqmlincubator/qqmlincubator.pro
index 780b69f379..9249061912 100644
--- a/tests/auto/qml/qqmlincubator/qqmlincubator.pro
+++ b/tests/auto/qml/qqmlincubator/qqmlincubator.pro
@@ -13,5 +13,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private network testlib
+QT += core-private gui-private qml-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
index 73f29ab973..648abd2945 100644
--- a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
+++ b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
@@ -7,5 +7,5 @@ CONFIG += parallel_test
include (../../shared/util.pri)
-QT += core-private gui-private v8-private qml-private testlib
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
index 942a511b7f..3b0518cfdf 100644
--- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro
+++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
@@ -12,7 +12,7 @@ SOURCES += ../../shared/testhttpserver.cpp
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private network testlib
+QT += core-private gui-private qml-private network testlib
include (../../shared/util.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
index ef044f1663..1555dc2b2c 100644
--- a/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
+++ b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
index 14f0604a9b..7647c3d713 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
+++ b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
@@ -8,5 +8,5 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro b/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
index a9a6a32a2b..54a6e0507f 100644
--- a/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
+++ b/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
@@ -7,5 +7,5 @@ TESTDATA = data/*
include (../../shared/util.pri)
CONFIG += parallel_test
-QT += core-private gui-private qml-private testlib v8-private
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlproperty/qqmlproperty.pro b/tests/auto/qml/qqmlproperty/qqmlproperty.pro
index 1ec02177ea..c2177d5fbf 100644
--- a/tests/auto/qml/qqmlproperty/qqmlproperty.pro
+++ b/tests/auto/qml/qqmlproperty/qqmlproperty.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private testlib
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro b/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro
index 5f75015d0d..7cc83cd440 100644
--- a/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro
+++ b/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro
@@ -5,5 +5,5 @@ macx:CONFIG -= app_bundle
SOURCES += tst_qqmlpropertycache.cpp
CONFIG += parallel_test
-QT += core-private gui-private qml-private testlib v8-private
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlqt/qqmlqt.pro b/tests/auto/qml/qqmlqt/qqmlqt.pro
index 0be49304fb..0470156e28 100644
--- a/tests/auto/qml/qqmlqt/qqmlqt.pro
+++ b/tests/auto/qml/qqmlqt/qqmlqt.pro
@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle
TESTDATA = data/*
-QT += core-private v8-private qml-private quick-private testlib gui gui-private
+QT += core-private qml-private quick-private testlib gui gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro
index bd58608925..c32f3c6c34 100644
--- a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro
+++ b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro
@@ -8,5 +8,5 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private sql testlib
+QT += core-private gui-private qml-private quick-private sql testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro b/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro
index a482db40b4..7ef81e0cc4 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro
+++ b/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro
@@ -13,5 +13,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private gui testlib
+QT += core-private gui-private qml-private quick-private gui testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro b/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro
index 1d02773146..e318966e56 100644
--- a/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro
+++ b/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro
@@ -13,5 +13,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private gui testlib
+QT += core-private gui-private qml-private quick-private gui testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro b/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro
index 56c89fab49..268b45f4e7 100644
--- a/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro
+++ b/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private testlib
+QT += core-private gui-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
index 36ece8d7e0..c6d442ecac 100644
--- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
+++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle
TESTDATA = data/*
-QT += core-private v8-private qml-private testlib gui gui-private
+QT += core-private qml-private testlib gui gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/v4/v4.pro b/tests/auto/qml/v4/v4.pro
index 8c7c30e399..ef549538da 100644
--- a/tests/auto/qml/v4/v4.pro
+++ b/tests/auto/qml/v4/v4.pro
@@ -12,5 +12,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private network testlib
+QT += core-private gui-private qml-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro
index 024b15a758..017ef0769a 100644
--- a/tests/auto/quick/dialogs/dialogs.pro
+++ b/tests/auto/quick/dialogs/dialogs.pro
@@ -9,7 +9,7 @@ macx:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
CONFIG += parallel_test
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
TESTDATA = data/*
diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro
index 7f95771766..6543aa1b2b 100644
--- a/tests/auto/quick/examples/examples.pro
+++ b/tests/auto/quick/examples/examples.pro
@@ -8,5 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
CONFIG += parallel_test
#temporary
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickanchors/qquickanchors.pro b/tests/auto/quick/qquickanchors/qquickanchors.pro
index b2e1c9df36..184066753b 100644
--- a/tests/auto/quick/qquickanchors/qquickanchors.pro
+++ b/tests/auto/quick/qquickanchors/qquickanchors.pro
@@ -11,5 +11,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro
index 747a2afdff..1e294b9ae0 100644
--- a/tests/auto/quick/qquickanimations/qquickanimations.pro
+++ b/tests/auto/quick/qquickanimations/qquickanimations.pro
@@ -11,5 +11,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro
index cbe9cf76fe..f005c03a82 100644
--- a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro
+++ b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickflickable/qquickflickable.pro b/tests/auto/quick/qquickflickable/qquickflickable.pro
index 67d5fc12f0..dfc8d7541b 100644
--- a/tests/auto/quick/qquickflickable/qquickflickable.pro
+++ b/tests/auto/quick/qquickflickable/qquickflickable.pro
@@ -9,6 +9,6 @@ include (../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
CONFIG+=insignificant_test
diff --git a/tests/auto/quick/qquickflipable/qquickflipable.pro b/tests/auto/quick/qquickflipable/qquickflipable.pro
index d07aab8d71..3e4d04a401 100644
--- a/tests/auto/quick/qquickflipable/qquickflipable.pro
+++ b/tests/auto/quick/qquickflipable/qquickflipable.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro
index dd69cda49e..1efa6c4ae3 100644
--- a/tests/auto/quick/qquickgridview/qquickgridview.pro
+++ b/tests/auto/quick/qquickgridview/qquickgridview.pro
@@ -10,7 +10,7 @@ include (../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
mac:CONFIG+=insignificant_test # QTBUG-27890
diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro
index ea6ae8f4af..81e2e3adef 100644
--- a/tests/auto/quick/qquickitem/qquickitem.pro
+++ b/tests/auto/quick/qquickitem/qquickitem.pro
@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro
index 62c6ee361c..ac4200a8a3 100644
--- a/tests/auto/quick/qquickitem2/qquickitem2.pro
+++ b/tests/auto/quick/qquickitem2/qquickitem2.pro
@@ -8,5 +8,5 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro
index d7e75a9924..999f0cf23d 100644
--- a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro
+++ b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro
@@ -9,7 +9,7 @@ TESTDATA = data/*
include(../../shared/util.pri)
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
OTHER_FILES += \
data/Smooth.qml \
diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro
index b0b1fc2518..a745c1ae46 100644
--- a/tests/auto/quick/qquicklistview/qquicklistview.pro
+++ b/tests/auto/quick/qquicklistview/qquicklistview.pro
@@ -12,7 +12,7 @@ include (../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
mac:CONFIG += insignificant_test # QTBUG-27740
diff --git a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro
index 1f03b0ed5d..381167cd09 100644
--- a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro
+++ b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro
@@ -6,5 +6,5 @@ SOURCES += tst_qquickpainteditem.cpp
CONFIG += parallel_test
-QT += core-private gui-private qml-private quick-private v8-private network testlib
+QT += core-private gui-private qml-private quick-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpath/qquickpath.pro b/tests/auto/quick/qquickpath/qquickpath.pro
index f91c872ad9..4898f28c14 100644
--- a/tests/auto/quick/qquickpath/qquickpath.pro
+++ b/tests/auto/quick/qquickpath/qquickpath.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index fb02caebdc..e6cf9a488f 100644
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -9,6 +9,6 @@ include (../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro
index 5e3872de83..4694172ac4 100644
--- a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro
+++ b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
index 1254c3b4d7..2f0395d3ea 100644
--- a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
+++ b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickstates/qquickstates.pro b/tests/auto/quick/qquickstates/qquickstates.pro
index 753d8d42d4..1b638dfa67 100644
--- a/tests/auto/quick/qquickstates/qquickstates.pro
+++ b/tests/auto/quick/qquickstates/qquickstates.pro
@@ -9,5 +9,5 @@ include (../../shared/util.pri)
TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro
index 4e3844bc58..c25a27b745 100644
--- a/tests/auto/quick/qquicktext/qquicktext.pro
+++ b/tests/auto/quick/qquicktext/qquicktext.pro
@@ -12,7 +12,7 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private network testlib
+QT += core-private gui-private qml-private quick-private network testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
mac:CONFIG += insignificant_test # QTBUG-27740
diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro
index 44def7f0f9..814291ac35 100644
--- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro
+++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro
@@ -11,7 +11,7 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private network-private testlib
+QT += core-private gui-private qml-private quick-private network-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro
index 3240d99e90..c14b09c545 100644
--- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro
+++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro
@@ -11,6 +11,6 @@ include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index 60ae065910..7b0e0c2878 100644
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -11,6 +11,6 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro
index b1fc5cd4f2..05b58fcb4c 100644
--- a/tests/auto/quick/qquickwindow/qquickwindow.pro
+++ b/tests/auto/quick/qquickwindow/qquickwindow.pro
@@ -6,7 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
TESTDATA = data/*
diff --git a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro
index 047d8ca560..da899a12ec 100644
--- a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro
+++ b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro
@@ -10,5 +10,5 @@ TESTDATA = data/*
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private network testlib xmlpatterns
+QT += core-private gui-private qml-private network testlib xmlpatterns
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/rendernode/rendernode.pro b/tests/auto/quick/rendernode/rendernode.pro
index 1e2c50a6d1..b195b97dcf 100644
--- a/tests/auto/quick/rendernode/rendernode.pro
+++ b/tests/auto/quick/rendernode/rendernode.pro
@@ -9,7 +9,7 @@ TESTDATA = data/*
include(../../shared/util.pri)
CONFIG += parallel_test
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
OTHER_FILES += \
data/RenderOrder.qml \
diff --git a/tests/auto/quick/shared/util.pri b/tests/auto/quick/shared/util.pri
index 28036f109c..bd2d202f1d 100644
--- a/tests/auto/quick/shared/util.pri
+++ b/tests/auto/quick/shared/util.pri
@@ -1,5 +1,5 @@
-QT += core-private gui-private v8-private qml-private quick-private
+QT += core-private gui-private qml-private quick-private
HEADERS += $$PWD/visualtestutil.h \
$$PWD/viewtestutil.h
diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro
index bba0abdc17..e21695904e 100644
--- a/tests/auto/quick/touchmouse/touchmouse.pro
+++ b/tests/auto/quick/touchmouse/touchmouse.pro
@@ -1,7 +1,7 @@
CONFIG += testcase
TARGET = tst_touchmouse
-QT += core-private gui-private qml-private quick-private v8-private testlib
+QT += core-private gui-private qml-private quick-private testlib
macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 687422c7ec..51d65d7243 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -7,5 +7,5 @@ testDataFiles.files = data
testDataFiles.path = .
DEPLOYMENT += testDataFiles
-QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
+QT += core-private gui-private qml-private quick-private opengl-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index 7ffded64b3..f4445f7d8a 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -7,5 +7,5 @@ testDataFiles.files = data
testDataFiles.path = .
DEPLOYMENT += testDataFiles
-QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
+QT += core-private gui-private qml-private quick-private opengl-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/animation/animation.pro b/tests/benchmarks/qml/animation/animation.pro
index 7490c5fe39..58933cf038 100644
--- a/tests/benchmarks/qml/animation/animation.pro
+++ b/tests/benchmarks/qml/animation/animation.pro
@@ -7,5 +7,5 @@ SOURCES += tst_animation.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\"
-QT += testlib core-private gui-private qml-private quick-private v8-private
+QT += testlib core-private gui-private qml-private quick-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/compilation/compilation.pro b/tests/benchmarks/qml/compilation/compilation.pro
index 63c3da694f..a55864f696 100644
--- a/tests/benchmarks/qml/compilation/compilation.pro
+++ b/tests/benchmarks/qml/compilation/compilation.pro
@@ -1,7 +1,7 @@
CONFIG += testcase
TEMPLATE = app
TARGET = tst_compilation
-QT += qml qml-private testlib core-private v8-private
+QT += qml qml-private testlib core-private
macx:CONFIG -= app_bundle
CONFIG += release
diff --git a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
index 76aecf9d13..0676405e23 100644
--- a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
+++ b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
@@ -7,5 +7,5 @@ testDataFiles.files = data
testDataFiles.path = .
DEPLOYMENT += testDataFiles
-QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
+QT += core-private gui-private qml-private quick-private opengl-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 \ No newline at end of file
diff --git a/tests/benchmarks/qml/script/script.pro b/tests/benchmarks/qml/script/script.pro
index 7beb3f81c1..51a02e796d 100644
--- a/tests/benchmarks/qml/script/script.pro
+++ b/tests/benchmarks/qml/script/script.pro
@@ -6,7 +6,7 @@ CONFIG += release
SOURCES += tst_script.cpp
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib
DEFINES += SRCDIR=\\\"$$PWD\\\"
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
index 7aa864c12f..b0134b085a 100644
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
@@ -7,5 +7,5 @@ CONFIG += release
SOURCES += tst_qjsvalue.cpp
-QT += core-private v8-private qml-private testlib
+QT += core-private qml-private testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/manual/v4/tests.pro b/tests/manual/v4/tests.pro
index 85e4f3a53d..5a0a97dcd3 100644
--- a/tests/manual/v4/tests.pro
+++ b/tests/manual/v4/tests.pro
@@ -1,2 +1,15 @@
-TEMPLATE = subdirs
-SUBDIRS += auto
+TEMPLATE = aux
+
+TESTSCRIPT=$$PWD/test262.py
+V4CMD = v4
+
+checktarget.target = check
+checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
+checktarget.depends = all
+QMAKE_EXTRA_TARGETS += checktarget
+
+checkmothtarget.target = check-interpreter
+checkmothtarget.commands = python $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations
+checkmothtarget.depends = all
+QMAKE_EXTRA_TARGETS += checkmothtarget
+
diff --git a/tools/qmlbundle/qmlbundle.pro b/tools/qmlbundle/qmlbundle.pro
index 440b152149..89b7477f63 100644
--- a/tools/qmlbundle/qmlbundle.pro
+++ b/tools/qmlbundle/qmlbundle.pro
@@ -1,4 +1,4 @@
-QT = core qml-private v8-private core-private
+QT = core qml-private core-private
SOURCES += main.cpp
diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro
index c5def993f3..b29768f10e 100644
--- a/tools/qmlprofiler/qmlprofiler.pro
+++ b/tools/qmlprofiler/qmlprofiler.pro
@@ -1,4 +1,4 @@
-QT += qml qml-private v8-private network core-private
+QT += qml qml-private network core-private
SOURCES += main.cpp \
qmlprofilerapplication.cpp \
diff --git a/tools/tools.pro b/tools/tools.pro
index 86e2f3804f..ab2d2e93df 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -4,5 +4,6 @@ qtHaveModule(qmltest): SUBDIRS += qmltestrunner
SUBDIRS += \
qmlmin \
qmlprofiler \
- qmlbundle
+ qmlbundle \
+ v4
qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing
diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp
index e61931cea4..3a91e59291 100644
--- a/tools/v4/main.cpp
+++ b/tools/v4/main.cpp
@@ -43,21 +43,21 @@
# include "private/qv4_llvm_p.h"
#endif // QMLJS_WITH_LLVM
-#include "private/debugging.h"
-#include "private/qv4object.h"
-#include "private/qv4runtime.h"
-#include "private/qv4functionobject.h"
-#include "private/qv4errorobject.h"
-#include "private/qv4globalobject.h"
+#include "private/qv4debugging_p.h"
+#include "private/qv4object_p.h"
+#include "private/qv4runtime_p.h"
+#include "private/qv4functionobject_p.h"
+#include "private/qv4errorobject_p.h"
+#include "private/qv4globalobject_p.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/qv4objectproto_p.h"
#include "private/qv4isel_p.h"
-#include "private/qv4mm.h"
-#include "private/qv4context.h"
+#include "private/qv4mm_p.h"
+#include "private/qv4context_p.h"
#include <QtCore>
#include <private/qqmljsengine_p.h>
diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro
index fcf1b28582..9ed6d3f2f4 100644
--- a/tools/v4/v4.pro
+++ b/tools/v4/v4.pro
@@ -1,8 +1,10 @@
TEMPLATE = app
-QT = v4-private core-private qmldevtools-private
+QT = qml-private core-private
SOURCES = main.cpp
-include(../../src/v4/v4.pri)
+include($$PWD/../../src/3rdparty/masm/masm-defs.pri)
+
+CONFIG += exceptions
llvm-libs {
DEFINES += QMLJS_WITH_LLVM