diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:41:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:41:55 +0200 |
| commit | 0d3592aa7fab8bf4d8f80bc3b35323efe6950b1b (patch) | |
| tree | 169707c4318185c418c8705628f03dd4118223e0 /src/qml/qml/qqmlvmemetaobject_p.h | |
| parent | b9e3df1cceb337947c2c701975163b53dbe131d8 (diff) | |
| parent | 265b3bea18c1ac13da413931024f64f49a2da7fc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index ea5e9c0904..891db5eb3f 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -112,6 +112,8 @@ public: if (it->m_propertyIndex == propertyIndex) return true; } + if (auto parentInterceptor = ((parent.isT1() && parent.flag()) ? static_cast<QQmlInterceptorMetaObject *>(parent.asT1()) : 0)) + return parentInterceptor->intercepts(propertyIndex); return false; } |