diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-02 15:02:39 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-09 14:01:46 +0000 |
| commit | 421d21a0334002f6497ce105876856dc0647c8ff (patch) | |
| tree | a82150cae6f96ba4122e5db32b80a7e2c3d0f606 /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 1eee98f1c1c59f8c45387684e269629713958bd4 (diff) | |
Don't store a FunctionObject in QQmlJavaScriptExpression anymore
Instead store the QmlContext, the QV4::Function and a source location.
Change-Id: Iafa54c09b9be7e78bace3498673ca94a2a145c97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index 887672b925..36024082c9 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -179,7 +179,10 @@ private: QQmlJavaScriptExpression *m_nextExpression; bool m_permanentDependenciesRegistered = false; - QV4::PersistentValue m_function; + QV4::PersistentValue m_qmlScope; + QQmlRefPointer<QV4::CompiledData::CompilationUnit> m_compilationUnit; + QV4::Function *m_v4Function; + QQmlSourceLocation *m_sourceLocation; // used for Qt.binding() created functions }; class QQmlPropertyCapture |