summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvmemetaobject_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-21 05:38:00 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-21 05:38:00 (GMT)
commitb49f57e4a2071f3b825d3e60b05c5914f16bd297 (patch)
tree8f72869900a9750dcf2f9040b9ded7811f9b9489 /src/declarative/qml/qmlvmemetaobject_p.h
parentc5a13f58a24487c1240e5592a5c40e5420a5cc35 (diff)
downloadQt-b49f57e4a2071f3b825d3e60b05c5914f16bd297.zip
Qt-b49f57e4a2071f3b825d3e60b05c5914f16bd297.tar.gz
Qt-b49f57e4a2071f3b825d3e60b05c5914f16bd297.tar.bz2
Tweak scoping
qmlContext() now returns the outer, not the inner context. The VME MetaObject now saves the context used to run function bodies
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject_p.h')
-rw-r--r--src/declarative/qml/qmlvmemetaobject_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
index d376f4c..de46853 100644
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ b/src/declarative/qml/qmlvmemetaobject_p.h
@@ -112,6 +112,7 @@ protected:
private:
QObject *object;
QmlRefCount *ref;
+ QGuard<QmlContext> ctxt;
const QmlVMEMetaData *metaData;
int propOffset;