diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-06-22 10:01:04 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-06-22 08:08:05 +0000 |
| commit | 14a20fb683b0473909e5e206ac82dc7a18d40060 (patch) | |
| tree | d49c4cb856ad830a9deac31525195b2973cfae8c /src/qml | |
| parent | 1ad60b1f5348e0003ee6277eae2002b424579f9e (diff) | |
Remove the old compiler pipeline
Don't compile the JIT and related code into libQtQml
anymore.
Change-Id: Ieb0ec33c964d09b121ede4097fe4218b147c673d
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 10 | ||||
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 1 | ||||
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml.pro | 3 |
4 files changed, 5 insertions, 11 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 31f351e6e6..afd6361206 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -7,10 +7,8 @@ HEADERS += \ $$PWD/qv4compiler_p.h \ $$PWD/qv4compilationunit_moth_p.h \ $$PWD/qv4codegen_p.h \ - $$PWD/qv4isel_p.h \ $$PWD/qv4jsir_p.h \ $$PWD/qv4isel_util_p.h \ - $$PWD/qv4ssa_p.h \ $$PWD/qqmlirbuilder_p.h \ $$PWD/qqmltypecompiler_p.h \ $$PWD/qv4jssimplifier_p.h @@ -21,9 +19,7 @@ SOURCES += \ $$PWD/qv4compiler.cpp \ $$PWD/qv4compilationunit_moth.cpp \ $$PWD/qv4codegen.cpp \ - $$PWD/qv4isel_p.cpp \ $$PWD/qv4jsir.cpp \ - $$PWD/qv4ssa.cpp \ $$PWD/qqmlirbuilder.cpp \ $$PWD/qv4jssimplifier.cpp @@ -50,11 +46,9 @@ qtConfig(private_tests):qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl qmldevtools_build|qtConfig(qml-interpreter) { HEADERS += \ - $$PWD/qv4instr_moth_p.h \ - $$PWD/qv4isel_moth_p.h + $$PWD/qv4instr_moth_p.h SOURCES += \ - $$PWD/qv4instr_moth.cpp \ - $$PWD/qv4isel_moth.cpp + $$PWD/qv4instr_moth.cpp } gcc { diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 63a240e575..e98f380945 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -44,7 +44,6 @@ #include <private/qqmlcustomparser_p.h> #include <private/qqmlvmemetaobject_p.h> #include <private/qqmlcomponent_p.h> -#include <private/qv4ssa_p.h> #include "qqmlpropertycachecreator_p.h" #include "qv4jssimplifier_p.h" diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 8b08e926ad..ae0faf3b72 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -52,7 +52,7 @@ #include <private/qv4string_p.h> #include <private/qv4value_p.h> #include <private/qv4bytecodegenerator_p.h> -#include <private/qv4isel_moth_p.h> +#include <private/qv4compilationunit_moth_p.h> #ifndef V4_BOOTSTRAP #include <qv4context_p.h> diff --git a/src/qml/qml.pro b/src/qml/qml.pro index be3956bb61..66f0b59226 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -44,7 +44,6 @@ include(memory/memory.pri) include(parser/parser.pri) include(compiler/compiler.pri) include(jsapi/jsapi.pri) -include(jit/jit.pri) include(jsruntime/jsruntime.pri) include(qml/qml.pri) include(debugger/debugger.pri) @@ -52,6 +51,8 @@ qtConfig(animation) { include(animations/animations.pri) } include(types/types.pri) +include(../3rdparty/masm/masm-defs.pri) +include(../3rdparty/masm/masm.pri) MODULE_PLUGIN_TYPES = \ qmltooling |