1 files changed, 46 insertions, 14 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 0a26ed89cc..4c6a1b69d8 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -1651,29 +1651,38 @@ QQmlEngine *qmlEngine(const QObject *obj)
     return data->context->engine;
 }
 
-QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create)
+static QObject *resolveAttachedProperties(QQmlAttachedPropertiesFunc pf, QQmlData *data,
+                                          QObject *object, bool create)
 {
-    QQmlData *data = QQmlData::get(object, create);
-    if (!data)
-        return nullptr; // Attached properties are only on objects created by QML, unless explicitly requested (create==true)
+    if (!pf)
+        return nullptr;
 
-    QObject *rv = data->hasExtendedData()?data->attachedProperties()->value(id):0;
+    QObject *rv = data->hasExtendedData() ? data->attachedProperties()->value(pf) : 0;
     if (rv || !create)
         return rv;
 
-    QQmlEnginePrivate *engine = QQmlEnginePrivate::get(data->context);
-    QQmlAttachedPropertiesFunc pf = QQmlMetaType::attachedPropertiesFuncById(engine, id);
-    if (!pf)
-        return nullptr;
-
-    rv = pf(const_cast<QObject *>(object));
+    rv = pf(object);
 
     if (rv)
-        data->attachedProperties()->insert(id, rv);
+        data->attachedProperties()->insert(pf, rv);
 
     return rv;
 }
 
+QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create)
+{
+    QQmlData *data = QQmlData::get(object, create);
+
+    // Attached properties are only on objects created by QML,
+    // unless explicitly requested (create==true)
+    if (!data)
+        return nullptr;
+
+    QQmlEnginePrivate *engine = QQmlEnginePrivate::get(data->context);
+    return resolveAttachedProperties(QQmlMetaType::attachedPropertiesFuncById(engine, id), data,
+                                     const_cast<QObject *>(object), create);
+}
+
 QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
                                      const QMetaObject *attachedMetaObject, bool create)
 {
@@ -1688,6 +1697,29 @@ QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
     return qmlAttachedPropertiesObjectById(*idCache, object, create);
 }
 
+QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *object,
+                                                         const QMetaObject *attachedMetaObject)
+{
+    QQmlEngine *engine = object ? qmlEngine(object) : nullptr;
+    return QQmlMetaType::attachedPropertiesFunc(engine ? QQmlEnginePrivate::get(engine) : nullptr,
+                                                attachedMetaObject);
+}
+
+QObject *qmlAttachedPropertiesObject(QObject *object, QQmlAttachedPropertiesFunc func, bool create)
+{
+    if (!object)
+        return nullptr;
+
+    QQmlData *data = QQmlData::get(object, create);
+
+    // Attached properties are only on objects created by QML,
+    // unless explicitly requested (create==true)
+    if (!data)
+        return nullptr;
+
+    return resolveAttachedProperties(func, data, object, create);
+}
+
 } // namespace QtQml
 
 #if QT_DEPRECATED_SINCE(5, 1)
@@ -1728,7 +1760,7 @@ public:
     QQmlDataExtended();
     ~QQmlDataExtended();
 
-    QHash<int, QObject *> attachedProperties;
+    QHash<QQmlAttachedPropertiesFunc, QObject *> attachedProperties;
 };
 
 QQmlDataExtended::QQmlDataExtended()
@@ -1874,7 +1906,7 @@ void QQmlData::disconnectNotifiers()
     }
 }
 
-QHash<int, QObject *> *QQmlData::attachedProperties() const
+QHash<QQmlAttachedPropertiesFunc, QObject *> *QQmlData::attachedProperties() const
 {
     if (!extendedData) extendedData = new QQmlDataExtended;
     return &extendedData->attachedProperties;