diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-03 22:25:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-03 22:32:56 +0200 |
| commit | b09555575936b8258a3385cce2c7401d0e672027 (patch) | |
| tree | a0cc95fd1b52b2394fa5ff9ac2b7a6a0e53f26fb /src/qml/qml/qqmlcontextwrapper.cpp | |
| parent | 5458d5103d6ebdffc31aed0f4c829f04320ecd9e (diff) | |
Another property query fix for the QObject bindings
Include attached properties only for lookups coming through JS, not
when going through the context wrapper. (This doesn't feel quite
right, but preserves behavior right now)
Change-Id: I2fedfd3343614733c8d556f56e604118e19314dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index f9dc3a3fc3..cdbd6e7add 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -231,7 +231,7 @@ Value QmlContextWrapper::get(Managed *m, ExecutionContext *ctx, String *name, bo if (scopeObject) { if (QV4::QObjectWrapper *o = qobjectWrapper->newQObject(scopeObject)->v4Value().as<QV4::QObjectWrapper>()) { bool hasProp = false; - QV4::Value result = o->getProperty(o->engine()->current, propertystring.string().asString(), QV4::QObjectWrapper::CheckRevision, &hasProp); + QV4::Value result = o->getQmlProperty(o->engine()->current, propertystring.string().asString(), QV4::QObjectWrapper::CheckRevision, &hasProp); if (hasProp) { if (hasProperty) *hasProperty = true; |