diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 16:46:38 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 16:46:38 +0200 |
commit | 374e41578af53c5a689e7676864c2a2038246936 (patch) | |
tree | e7adc6bf8ee25275af25c69926002c7b6dc2e6a3 /src/qml | |
parent | 325e6305b418ffe1dfb9a36c2516c6a8a3de5733 (diff) | |
parent | bb882f433b6cf6fca56049df6b654fb6a39a7cab (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I662790341c4b1ee816b0639067fe3f0e38a002b4
Diffstat (limited to 'src/qml')
-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); |