diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 14:46:48 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-02 15:25:02 +0000 |
commit | 1226078daccb988f46b4049656c768360b222ecd (patch) | |
tree | 7629bc8ca6f3ca059f1d57fd4548ebad08e7cbfa /src | |
parent | 55c497ecf47894c602c1b4a08099ac63546b9260 (diff) | |
parent | 374e41578af53c5a689e7676864c2a2038246936 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src')
-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); |