aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmljs
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-09-05 13:12:58 +0200
committerLars Knoll <lars.knoll@qt.io>2016-10-10 14:11:44 +0000
commit11e0e5574a529e337e43ab15fca357b109ea2834 (patch)
tree8126934e7242c6957a4feffdb2474a655c3aa4ab /tools/qmljs
parente48c4134afcb8d4b33c3e965ce5d94e629982d2e (diff)
Make the Moth interpreter configurable
Change-Id: I2b784820c4e39a7932f81bfee9ce78e01a2e96b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmljs')
-rw-r--r--tools/qmljs/qmljs.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index e9454c0f8d..b4ffc9be16 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -32,8 +32,10 @@
#include "private/qv4errorobject_p.h"
#include "private/qv4globalobject_p.h"
#include "private/qv4codegen_p.h"
+#if QT_CONFIG(qml_interpreter)
#include "private/qv4isel_moth_p.h"
#include "private/qv4vme_moth_p.h"
+#endif
#include "private/qv4objectproto_p.h"
#include "private/qv4isel_p.h"
#include "private/qv4mm_p.h"
@@ -43,6 +45,8 @@
#ifdef V4_ENABLE_JIT
# include "private/qv4isel_masm_p.h"
+#else
+QT_REQUIRE_CONFIG(qml_interpreter);
#endif // V4_ENABLE_JIT
#include <QtCore/QCoreApplication>
@@ -150,10 +154,12 @@ int main(int argc, char *argv[])
args.removeFirst();
}
+#if QT_CONFIG(qml_interpreter)
if (args.first() == QLatin1String("--interpret")) {
mode = use_moth;
args.removeFirst();
}
+#endif
if (args.first() == QLatin1String("--qml")) {
runAsQml = true;
@@ -171,7 +177,9 @@ int main(int argc, char *argv[])
case use_moth: {
QV4::EvalISelFactory* iSelFactory = 0;
if (mode == use_moth) {
+#if QT_CONFIG(qml_interpreter)
iSelFactory = new QV4::Moth::ISelFactory;
+#endif
#ifdef V4_ENABLE_JIT
} else {
iSelFactory = new QV4::JIT::ISelFactory;