diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
| commit | d9ea4917ca97aeee050a86151fbfa069771b498d (patch) | |
| tree | 21fd6960d8a866bf6f5a5a8f9db9be801f8065c1 /src/qml/jsruntime/qv4enginebase_p.h | |
| parent | f9beafddd256cd0b79bf2478a812053ef61241fc (diff) | |
| parent | c6a26c248e8abc421b87c3dd6b2466d490ea902e (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97
Diffstat (limited to 'src/qml/jsruntime/qv4enginebase_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4enginebase_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index e0f5f3ffb1..59fb4a564a 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -101,7 +101,6 @@ struct Q_QML_EXPORT EngineBase { Class_FunctionObject, Class_StringObject, Class_ScriptFunction, - Class_BuiltinFunction, Class_ObjectProto, Class_RegExp, Class_RegExpObject, @@ -111,6 +110,8 @@ struct Q_QML_EXPORT EngineBase { Class_ErrorObject, Class_ErrorObjectWithMessage, Class_ErrorProto, + Class_QmlContextWrapper, + Class_QmlContext, NClasses }; InternalClass *internalClasses[NClasses]; |