diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-03-23 13:17:10 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-05-20 13:44:13 +0000 |
| commit | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (patch) | |
| tree | 4c3925a5e58ea52c415098169855494341ab5a77 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 41a426d78177b704cdf321fdf0b36b7cabc29a56 (diff) | |
V4: allow inlining of ExecutionEngine::{qml,js}Engine()
All other changes are just to be able to include qv8engine_p.h in
qv4engine_p.h
Change-Id: I71ba2ec42cdc20d5c7d97a74b99b4d1ada1a5ed8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index b42dc37b0f..d9692a0876 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -112,6 +112,7 @@ static ReturnedValue throwTypeError(CallContext *ctx) } +#ifdef V4_BOOTSTRAP QJSEngine *ExecutionEngine::jsEngine() const { return v8Engine->publicEngine(); @@ -121,6 +122,7 @@ QQmlEngine *ExecutionEngine::qmlEngine() const { return v8Engine->engine(); } +#endif // V4_BOOTSTRAP qint32 ExecutionEngine::maxCallDepth = -1; |