From d7457460abac9023780c21b69af6c2ba201a47d7 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 19 Dec 2017 16:06:32 +0100
Subject: Drop the qml-interpreter feature

We cannot build QML without interpreter anymore.

Change-Id: Ibc51240caa956132eef8753fa6c75939026930d5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/plugins/qmltooling/qmltooling.pro | 16 ++++++----------
 src/qml/compiler/compiler.pri         | 13 ++++---------
 src/qml/compiler/qv4instr_moth_p.h    |  4 ----
 src/qml/configure.json                |  8 --------
 src/qml/jsruntime/jsruntime.pri       | 13 ++++---------
 src/qml/jsruntime/qv4vme_moth_p.h     |  2 --
 6 files changed, 14 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 5895169ca0..55828a46f8 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -22,18 +22,14 @@ qtConfig(qml-network) {
 # Services
 SUBDIRS += \
     qmldbg_messages \
-    qmldbg_profiler
+    qmldbg_profiler \
+    qmldbg_debugger \
+    qmldbg_nativedebugger
+
 qmldbg_messages.depends = packetprotocol
 qmldbg_profiler.depends = packetprotocol
-
-qtConfig(qml-interpreter) {
-    SUBDIRS += \
-        qmldbg_debugger \
-        qmldbg_nativedebugger
-
-    qmldbg_debugger.depends = packetprotocol
-    qmldbg_nativedebugger.depends = packetprotocol
-}
+qmldbg_debugger.depends = packetprotocol
+qmldbg_nativedebugger.depends = packetprotocol
 
 qtHaveModule(quick) {
     SUBDIRS += \
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)
diff --git a/src/qml/configure.json b/src/qml/configure.json
index 723bd740fc..b744ea6948 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -7,19 +7,12 @@
 
     "commandline": {
         "options": {
-            "qml-interpreter": "boolean",
             "qml-network": "boolean",
             "qml-debug": "boolean"
         }
     },
 
     "features": {
-        "qml-interpreter": {
-            "label": "QML interpreter",
-            "purpose": "Provides the QML interpreter.",
-            "section": "QML",
-            "output": [ "privateFeature" ]
-        },
         "qml-network": {
             "label": "QML network support",
             "purpose": "Provides network transparency.",
@@ -53,7 +46,6 @@
         {
             "section": "Qt QML",
             "entries": [
-                "qml-interpreter",
                 "qml-network",
                 "qml-debug"
             ]
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 519c87d0c4..4bc877bd9d 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -41,7 +41,8 @@ SOURCES += \
     $$PWD/qv4qobjectwrapper.cpp \
     $$PWD/qv4arraybuffer.cpp \
     $$PWD/qv4typedarray.cpp \
-    $$PWD/qv4dataview.cpp
+    $$PWD/qv4dataview.cpp \
+    $$PWD/qv4vme_moth.cpp
 
 qtConfig(qml-debug): SOURCES += $$PWD/qv4profiling.cpp
 
@@ -94,14 +95,8 @@ HEADERS += \
     $$PWD/qv4profiling_p.h \
     $$PWD/qv4arraybuffer_p.h \
     $$PWD/qv4typedarray_p.h \
-    $$PWD/qv4dataview_p.h
-
-qtConfig(qml-interpreter) {
-    HEADERS += \
-        $$PWD/qv4vme_moth_p.h
-    SOURCES += \
-        $$PWD/qv4vme_moth.cpp
-}
+    $$PWD/qv4dataview_p.h \
+    $$PWD/qv4vme_moth_p.h
 
 }
 
diff --git a/src/qml/jsruntime/qv4vme_moth_p.h b/src/qml/jsruntime/qv4vme_moth_p.h
index dbf9ed3550..3b7723ca7e 100644
--- a/src/qml/jsruntime/qv4vme_moth_p.h
+++ b/src/qml/jsruntime/qv4vme_moth_p.h
@@ -53,8 +53,6 @@
 
 #include <private/qv4global_p.h>
 
-QT_REQUIRE_CONFIG(qml_interpreter);
-
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
-- 
cgit v1.2.3