diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
| commit | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (patch) | |
| tree | 33246b027739aafd72f9f289876f69627537f2b3 /src/qml/compiler/qv4compileddata_p.h | |
| parent | b63bc868875d7571bc332804f984824cff7c5b78 (diff) | |
| parent | 685ad676a84bf48602a5da8f7171792686b94a73 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4mathobject.cpp
Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 79476dbe5e..e2cdc3d8fc 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -879,6 +879,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public #ifndef V4_BOOTSTRAP ExecutionEngine *engine; + QQmlEnginePrivate *qmlEngine; // only used in QML environment for composite types, not in plain QJSEngine case. QString fileName() const { return data->stringAt(data->sourceFileIndex); } QUrl url() const { if (m_url.isNull) m_url = QUrl(fileName()); return m_url; } @@ -908,7 +909,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public // pointers either to data->constants() or little-endian memory copy. const Value* constants; - void finalize(QQmlEnginePrivate *engine); + void finalizeCompositeType(QQmlEnginePrivate *qmlEngine); int totalBindingsCount; // Number of bindings used in this type int totalParserStatusCount; // Number of instantiated types that are QQmlParserStatus subclasses |