Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I662790341c4b1ee816b0639067fe3f0e38a002b4

1 files changed, 1 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h
index fa05b3fe19..ae84803648 100644
--- a/src/qml/qml/qqmlprivate.h
+++ b/src/qml/qml/qqmlprivate.h
@@ -190,16 +190,13 @@ namespace QQmlPrivate
     template<typename T>
     class AttachedPropertySelector<T, 1>
     {
-        static inline QObject *attachedProperties(QObject *obj) {
-            return T::qmlAttachedProperties(obj);
-        }
         template<typename ReturnType>
         static inline const QMetaObject *attachedPropertiesMetaObject(ReturnType *(*)(QObject *)) {
             return &ReturnType::staticMetaObject;
         }
     public:
         static inline QQmlAttachedPropertiesFunc func() {
-            return &attachedProperties;
+            return QQmlAttachedPropertiesFunc(&T::qmlAttachedProperties);
         }
         static inline const QMetaObject *metaObject() {
             return attachedPropertiesMetaObject(&T::qmlAttachedProperties);