Eliminate excessive friendlyness of QQmlType

QQmlMetaTypeData does need to be exposed to the QQmlType ctors. Rather,
we can use factory functions to create the QQmlTypePrivate objects.

The static attachedPropertyIds should really be part of QQmlMetaTypeData
and access to them should be protected by the lock.

Task-number: QTBUG-73271
Change-Id: I154a3842fab03a02c710901a20afd1652364808d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 19 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
index cde6294c37..f61adada2c 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -128,8 +128,27 @@ struct QQmlMetaTypeData
             qWarning("%s", message.toUtf8().constData());
     }
 
+    int attachedPropertyId(const QMetaObject *metaObject, int ownIndex)
+    {
+        auto iter = attachedPropertyIds.find(metaObject);
+        return (iter == attachedPropertyIds.end())
+                ? *attachedPropertyIds.insert(metaObject, ownIndex)
+                : *iter;
+    }
+
+    bool removeAttachedPropertyId(const QMetaObject *metaObject, int ownIndex)
+    {
+        auto iter = attachedPropertyIds.find(metaObject);
+        if (iter != attachedPropertyIds.end() && *iter == ownIndex) {
+            attachedPropertyIds.erase(iter);
+            return true;
+        }
+        return false;
+    }
+
 private:
     QStringList *m_typeRegistrationFailures = nullptr;
+    QHash<const QMetaObject *, int> attachedPropertyIds;
 };
 
 inline uint qHash(const QQmlMetaTypeData::VersionedUri &v)