diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-14 10:30:02 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-18 10:37:59 +0100 |
commit | 9b2af0c5f581797e0098494efa93365a2dc6d0bf (patch) | |
tree | 05150d0c0dc8fbf9da70a7aa2416fc1b97c2e2f9 /src/qml/qml/qqmltype_p_p.h | |
parent | c5675c9c8f549beb9966644277010eb847c72bcd (diff) |
Retrieve the attached properties base type without recursion
This is probably faster and avoids the deprecation warnings stemming
from deprecated functions calling themselves recursively.
Task-number: QTBUG-80040
Change-Id: I2f65aad3bc7f85b7a7de66d3e76dac1233a58db8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltype_p_p.h')
-rw-r--r-- | src/qml/qml/qqmltype_p_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltype_p_p.h b/src/qml/qml/qqmltype_p_p.h index 6a2d961de8..51f776178c 100644 --- a/src/qml/qml/qqmltype_p_p.h +++ b/src/qml/qml/qqmltype_p_p.h @@ -82,6 +82,18 @@ public: } } + const QQmlTypePrivate *attachedPropertiesBase(QQmlEnginePrivate *engine) const + { + for (const QQmlTypePrivate *d = this; d; d = d->resolveCompositeBaseType(engine).d.data()) { + if (d->regType == QQmlType::CppType) + return d->extraData.cd->attachedPropertiesType ? d : nullptr; + + if (d->regType != QQmlType::CompositeType) + return nullptr; + } + return nullptr; + } + bool isComposite() const { return regType == QQmlType::CompositeType || regType == QQmlType::CompositeSingletonType; |