summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-08-03 05:09:56 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-08-03 05:09:56 (GMT)
commit953078ed630dd7e3dae568bf003950bda98d8f47 (patch)
tree4b8300ffeebff96746bf56e6cdcbe4b33b4fc7c8 /src/declarative/qml/qmlengine.cpp
parent651b7aa72052faa90b3a268f00f82d56460166d3 (diff)
downloadQt-953078ed630dd7e3dae568bf003950bda98d8f47.zip
Qt-953078ed630dd7e3dae568bf003950bda98d8f47.tar.gz
Qt-953078ed630dd7e3dae568bf003950bda98d8f47.tar.bz2
Make QmlMetaProperty reentrant
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
-rw-r--r--src/declarative/qml/qmlengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 321feb9..c331f56 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -196,7 +196,7 @@ QmlEnginePrivate::queryObject(const QString &propName,
{
QScriptClass::QueryFlags rv = 0;
- QmlMetaProperty prop(obj, propName);
+ QmlMetaProperty prop(obj, propName, rootContext);
if (prop.type() == QmlMetaProperty::Invalid) {
QPair<const QMetaObject *, QString> key =
qMakePair(obj->metaObject(), propName);