diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:30:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:37:14 +0200 |
| commit | 96b2323355a082599b7191f3079e8363bee825e0 (patch) | |
| tree | ec2c3737566802816eb8aed8539a354179394359 /src/qml/compiler/qv4compileddata_p.h | |
| parent | 83e9d165761ad68730722aeb0bffb8fabe555d1f (diff) | |
| parent | 0af2998cc99e90e3df34f794801340d8a769c735 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4engine.cpp
Change-Id: I5f7b63a937a214267e15ad5757844d662a4f981b
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index ce54e4fae4..adf6c21cc3 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -66,6 +66,7 @@ #ifndef V4_BOOTSTRAP #include <private/qqmltypenamecache_p.h> #include <private/qqmlpropertycache_p.h> +#include "private/qintrusivelist_p.h" #endif QT_BEGIN_NAMESPACE @@ -880,6 +881,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public virtual QV4::CompiledData::Unit *createUnitData(QmlIR::Document *irDocument); #ifndef V4_BOOTSTRAP + QIntrusiveListNode nextCompilationUnit; ExecutionEngine *engine; QQmlEnginePrivate *qmlEngine; // only used in QML environment for composite types, not in plain QJSEngine case. |