diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-23 14:29:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-24 05:55:06 +0000 |
| commit | ec2b2a5f5d804095b6b2b8575b1cd1b75a8335ff (patch) | |
| tree | 6817868777a3fca03f25aa9fc17d6202e442f910 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 46c6db6f58fadb2bc4d3e9be5a7f93824e43db64 (diff) | |
Fold QQmlVMEMetaData::Alias::flags into QV4::CompiledData::Alias::flags
We only need one bit, so this is easy to merge.
Change-Id: I98bf882b8c1bf10f2172a9e22331d621985d3ed4
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index bb02c2c218..b0b7995ae2 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -833,11 +833,9 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * id -= propertyCount; if (id < aliasCount) { - - QQmlVMEMetaData::AliasData *d = metaData->aliasData() + id; const QV4::CompiledData::Alias *aliasData = &compiledObject->aliasTable()[id]; - if (d->flags & QML_ALIAS_FLAG_PTR && c == QMetaObject::ReadProperty) + if ((aliasData->flags & QV4::CompiledData::Alias::AliasPointsToPointerObject) && c == QMetaObject::ReadProperty) *reinterpret_cast<void **>(a[0]) = 0; if (!ctxt) return -1; |