diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 16:06:32 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-01-10 12:19:28 +0000 |
| commit | d7457460abac9023780c21b69af6c2ba201a47d7 (patch) | |
| tree | e1ec9f523138214dc39c903835c6e617b7064995 /src/qml/compiler | |
| parent | af1565852b0701964ee3b9de1d094b6b89e44d45 (diff) | |
Drop the qml-interpreter feature
We cannot build QML without interpreter anymore.
Change-Id: Ibc51240caa956132eef8753fa6c75939026930d5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 13 | ||||
| -rw-r--r-- | src/qml/compiler/qv4instr_moth_p.h | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 0d63d3b76f..2ca0c39acc 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -10,7 +10,8 @@ HEADERS += \ $$PWD/qv4compilerscanfunctions_p.h \ $$PWD/qv4codegen_p.h \ $$PWD/qqmlirbuilder_p.h \ - $$PWD/qqmltypecompiler_p.h + $$PWD/qqmltypecompiler_p.h \ + $$PWD/qv4instr_moth_p.h SOURCES += \ $$PWD/qv4bytecodegenerator.cpp \ @@ -19,7 +20,8 @@ SOURCES += \ $$PWD/qv4compilercontext.cpp \ $$PWD/qv4compilerscanfunctions.cpp \ $$PWD/qv4codegen.cpp \ - $$PWD/qqmlirbuilder.cpp + $$PWD/qqmlirbuilder.cpp \ + $$PWD/qv4instr_moth.cpp !qmldevtools_build { @@ -42,13 +44,6 @@ else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp qtConfig(private_tests):qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl } -qmldevtools_build|qtConfig(qml-interpreter) { - HEADERS += \ - $$PWD/qv4instr_moth_p.h - SOURCES += \ - $$PWD/qv4instr_moth.cpp -} - gcc { equals(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -fno-strict-aliasing } diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h index eb25aad110..6fa33facab 100644 --- a/src/qml/compiler/qv4instr_moth_p.h +++ b/src/qml/compiler/qv4instr_moth_p.h @@ -54,10 +54,6 @@ #include <private/qv4value_p.h> #include <private/qv4runtime_p.h> -#if !defined(V4_BOOTSTRAP) -QT_REQUIRE_CONFIG(qml_interpreter); -#endif - QT_BEGIN_NAMESPACE #if !QT_CONFIG(qml_debug) |