diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 09:33:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 09:33:52 +0200 |
commit | bb882f433b6cf6fca56049df6b654fb6a39a7cab (patch) | |
tree | bef2da3a4781b2edf157c55efe5222bc0e78647b | |
parent | ad6061b265b6a482a6e0e29b20be0c681332abb1 (diff) | |
parent | 6a8d4f614171444a77a127dc2e22f295d1ffabe2 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic10f47e4763d67d989df77f2dc11d9705ec7fb6b
-rw-r--r-- | src/qml/qml/qqmlprivate.h | 5 |
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); |