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/qml/v8/qv8engine_p.h | |
| 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/qml/v8/qv8engine_p.h')
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 4ffd36ca34..2cfa996409 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -60,22 +60,20 @@ #include <QtCore/QElapsedTimer> #include <QtCore/QThreadStorage> -#include <qjsengine.h> +#include <QtQml/qjsengine.h> #include "private/qintrusivelist_p.h" -#include <private/qqmlpropertycache_p.h> -#include <private/qv4qobjectwrapper_p.h> #include <private/qv4value_p.h> -#include <private/qv4object_p.h> #include <private/qv4identifier_p.h> -#include <private/qqmlcontextwrapper_p.h> +#include <private/qv4context_p.h> QT_BEGIN_NAMESPACE namespace QV4 { struct ArrayObject; struct ExecutionEngine; + struct QObjectMethod; } // Uncomment the following line to enable global handle debugging. When enabled, all the persistent |