aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlobjectcreator_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-09-13 13:43:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-20 14:26:12 +0200
commit7def3cfb31603b47a1b4e5690f8c650768f9b803 (patch)
treeb7aa966470f960fed20a366cf7c77a0357082eb5 /src/qml/qml/qqmlobjectcreator_p.h
parent5c4c9123917fb411598807cd9bb855b9aa1fa832 (diff)
[new compiler] Fix function and binding expression setup
Binding expressions and QML used to be set up so that they were written as function closure: (function(...) { expression here }) and then evaluated inside qml scope. With the new setup we do that closure setup manually now. For that we have to define a dummy outter "context scope" function in the codegen, that will later be used to look up the context ids. Change-Id: I0656419d67a1728451fcd46f402b03979f118b0b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
-rw-r--r--src/qml/qml/qqmlobjectcreator_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index 026d62fd99..8aa037755f 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -90,8 +90,8 @@ public:
private:
void populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache);
- QVector<QQmlAbstractBinding *> setupBindings(QV4::Object *qmlGlobal);
- void setupFunctions(QV4::Object *qmlGlobal);
+ QVector<QQmlAbstractBinding *> setupBindings(QV4::ExecutionContext *qmlContext);
+ void setupFunctions(QV4::ExecutionContext *qmlContext);
QVariant variantForBinding(int expectedMetaType, const QV4::CompiledData::Binding *binding) const;