aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4isel_p.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-11-02 17:40:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-25 22:04:42 +0100
commit62c906059516bb829f05073096fd3e12f5103fba (patch)
tree92176ac795e64dff690ed100f61935f301189871 /src/qml/compiler/qv4isel_p.cpp
parent71e498adc4d8af11205de2eeefc50ab9eb1ad497 (diff)
Cleanup, get rid of MemberOfQObject V4IR::Member specialization
It is technically redundant to the Member::property field. Change-Id: If0ee35b2c94a2c9373784d36a1f8dfe8ad7dcfb3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4isel_p.cpp')
-rw-r--r--src/qml/compiler/qv4isel_p.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index 45b1e9f3b0..b3407867b4 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -150,7 +150,7 @@ void IRDecoder::visitMove(V4IR::Move *s)
loadQmlIdObject(m->memberIndex, t);
return;
}
- } else if (m->type == V4IR::Member::MemberOfQObject) {
+ } else if (m->property) {
bool captureRequired = true;
if (_function) {
captureRequired = !_function->contextObjectDependencies.contains(m->property)
@@ -195,7 +195,7 @@ void IRDecoder::visitMove(V4IR::Move *s)
} else if (V4IR::Member *m = s->target->asMember()) {
if (m->base->asTemp() || m->base->asConst()) {
if (s->source->asTemp() || s->source->asConst()) {
- if (m->type == V4IR::Member::MemberOfQObject) {
+ if (m->property) {
setQObjectProperty(s->source, m->base, m->property->coreIndex);
return;
} else {