From 185d9b5b72a2c062c4670b17385ec1e6e576c4d9 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 2 Jun 2020 16:28:31 +0200 Subject: Adapt to metaobject changes Change-Id: I31dd544e80b8b2f8745463450a05fa7effafa8cd Reviewed-by: Ulf Hermann --- src/qml/qml/qqmltype.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/qml/qml/qqmltype.cpp') diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index ffb1e0ac4c..5ae87c429d 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -189,20 +189,7 @@ QQmlPropertyCache *QQmlTypePrivate::compositePropertyCache(QQmlEnginePrivate *en static bool isPropertyRevisioned(const QMetaObject *mo, int index) { - int i = index; - i -= mo->propertyOffset(); - if (i < 0 && mo->d.superdata) - return isPropertyRevisioned(mo->d.superdata, index); - - const QMetaObjectPrivate *mop = reinterpret_cast(mo->d.data); - if (i >= 0 && i < mop->propertyCount) { - int handle = mop->propertyData + 3*i; - int flags = mo->d.data[handle + 2]; - - return (flags & Revisioned); - } - - return false; + return mo->property(index).revision(); } void QQmlTypePrivate::init() const -- cgit v1.2.3