Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105

1 files changed, 0 insertions, 19 deletions

diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
index c45bc16280..5239b635ce 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -134,27 +134,8 @@ 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)